Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -aur /home/yoann/smplayer-0.8.5/src/core.cpp /home/yoann/smplayer-0.8.5.new/src/core.cpp
- --- /home/yoann/smplayer-0.8.5/src/core.cpp 2013-04-30 03:09:47.000000000 +0200
- +++ /home/yoann/smplayer-0.8.5.new/src/core.cpp 2013-06-03 09:54:42.904664803 +0200
- @@ -1524,6 +1524,14 @@
- lavdopts += "skiploopfilter=all";
- }
- + if ( (pref->h264_skip_loop_filter == Preferences::LoopDisabled) ||
- + ((pref->h264_skip_loop_filter == Preferences::LoopDisabledOnHD) &&
- + (mset.is264andFHD)) )
- + {
- + if (!lavdopts.isEmpty()) lavdopts += ":";
- + lavdopts += "skiploopfilter=all:skipframe=nonref:fast";
- + }
- +
- if (pref->threads > 1) {
- if (!lavdopts.isEmpty()) lavdopts += ":";
- lavdopts += "threads=" + QString::number(pref->threads);
- @@ -4112,13 +4120,22 @@
- qDebug("Core::checkIfVideoIsHD");
- // Check if the video is in HD and uses ffh264 codec.
- - if ((mdat.video_codec=="ffh264") && (mset.win_height >= pref->HD_height)) {
- - qDebug("Core::checkIfVideoIsHD: video == ffh264 and height >= %d", pref->HD_height);
- + if ((mdat.video_codec=="ffh264") && (mset.win_height == pref->HD_height) && (mset.win_width == pref->HD_width)) {
- + qDebug("Core::checkIfVideoIsHD: video == ffh264 and height == %d", pref->HD_height);
- if (!mset.is264andHD) {
- mset.is264andHD = true;
- if (pref->h264_skip_loop_filter == Preferences::LoopDisabledOnHD) {
- qDebug("Core::checkIfVideoIsHD: we're about to restart the video");
- restartPlay();
- + }
- + }
- + } else if ((mdat.video_codec=="ffh264") && (mset.win_height > pref->HD_height) && (mset.win_width > pref->HD_width)) {
- + qDebug("Core::checkIfVideoIsHD: height > %d", pref->HD_height);
- + if (!mset.is264andFHD) {
- + mset.is264andFHD = true;
- + if (pref->h264_skip_loop_filter == Preferences::LoopDisabledOnHD) {
- + qDebug("Core::checkIfVideoIsHD: we're about to restart the video");
- + restartPlay();
- }
- }
- } else {
- diff -aur /home/yoann/smplayer-0.8.5/src/mediasettings.cpp /home/yoann/smplayer-0.8.5.new/src/mediasettings.cpp
- --- /home/yoann/smplayer-0.8.5/src/mediasettings.cpp 2013-02-16 22:49:17.000000000 +0100
- +++ /home/yoann/smplayer-0.8.5.new/src/mediasettings.cpp 2013-06-03 09:56:18.603468403 +0200
- @@ -108,6 +108,7 @@
- B_marker = -1;
- is264andHD = false;
- + is264andFHD = false;
- forced_demuxer="";
- forced_video_codec="";
- @@ -262,6 +263,7 @@
- qDebug(" starting_time: %f", starting_time);
- qDebug(" is264andHD: %d", is264andHD);
- + qDebug(" is264andFHD: %d", is264andFHD);
- }
- #ifndef NO_USE_INI_FILES
- @@ -361,6 +363,7 @@
- set->setValue( "starting_time", starting_time );
- set->setValue( "is264andHD", is264andHD );
- + set->setValue( "is264andFHD", is264andFHD );
- /*set->endGroup();*/
- }
- @@ -461,6 +464,7 @@
- starting_time = set->value( "starting_time", starting_time ).toDouble();
- is264andHD = set->value( "is264andHD", is264andHD ).toBool();
- + is264andFHD = set->value( "is264andFHD", is264andFHD ).toBool();
- /*set->endGroup();*/
- diff -aur /home/yoann/smplayer-0.8.5/src/mediasettings.h /home/yoann/smplayer-0.8.5.new/src/mediasettings.h
- --- /home/yoann/smplayer-0.8.5/src/mediasettings.h 2013-04-21 00:59:33.000000000 +0200
- +++ /home/yoann/smplayer-0.8.5.new/src/mediasettings.h 2013-06-03 09:56:36.789241050 +0200
- @@ -141,6 +141,7 @@
- //! The codec of the video is ffh264 and it's high definition
- bool is264andHD;
- + bool is264andFHD;
- // Advanced settings
- QString forced_demuxer;
- diff -aur /home/yoann/smplayer-0.8.5/src/preferences.cpp /home/yoann/smplayer-0.8.5.new/src/preferences.cpp
- --- /home/yoann/smplayer-0.8.5/src/preferences.cpp 2013-05-02 01:15:42.000000000 +0200
- +++ /home/yoann/smplayer-0.8.5.new/src/preferences.cpp 2013-06-03 09:58:27.187860877 +0200
- @@ -179,6 +179,7 @@
- coreavc = false;
- h264_skip_loop_filter = LoopEnabled;
- HD_height = 720;
- + HD_width = 1280;
- // MPlayer 1.0rc1 require restart, new versions don't
- fast_audio_change = Detect;
- @@ -620,6 +621,7 @@
- set->setValue("coreavc", coreavc);
- set->setValue("h264_skip_loop_filter", h264_skip_loop_filter);
- set->setValue("HD_height", HD_height);
- + set->setValue("HD_width", HD_width);
- set->setValue("fast_audio_change", fast_audio_change);
- #if !SMART_DVD_CHAPTERS
- @@ -1079,6 +1081,7 @@
- coreavc = set->value("coreavc", coreavc).toBool();
- h264_skip_loop_filter = (H264LoopFilter) set->value("h264_skip_loop_filter", h264_skip_loop_filter).toInt();
- HD_height = set->value("HD_height", HD_height).toInt();
- + HD_width = set->value("HD_width", HD_width).toInt();
- fast_audio_change = (OptionState) set->value("fast_audio_change", fast_audio_change).toInt();
- #if !SMART_DVD_CHAPTERS
- diff -aur /home/yoann/smplayer-0.8.5/src/preferences.h /home/yoann/smplayer-0.8.5.new/src/preferences.h
- --- /home/yoann/smplayer-0.8.5/src/preferences.h 2013-03-11 23:44:00.000000000 +0100
- +++ /home/yoann/smplayer-0.8.5.new/src/preferences.h 2013-06-03 09:59:13.400283142 +0200
- @@ -164,6 +164,7 @@
- bool coreavc;
- H264LoopFilter h264_skip_loop_filter;
- int HD_height; //!< An HD is a video which height is equal or greater than this.
- + int HD_width; //!< An HD is a video which width is equal or greater than this.
- OptionState fast_audio_change; // If activated, not restart mplayer
- #if !SMART_DVD_CHAPTERS
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement