projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.cc
diff --git
a/src/lib/ffmpeg_examiner.cc
b/src/lib/ffmpeg_examiner.cc
index 2c6e1b21f3da50cc25ab32feef55d913dd3fff40..b75d6c5149ced496e4cb1eb4dd60b17d3aa9df67 100644
(file)
--- a/
src/lib/ffmpeg_examiner.cc
+++ b/
src/lib/ffmpeg_examiner.cc
@@
-45,7
+45,7
@@
using std::string;
using std::cout;
using std::max;
using std::vector;
using std::cout;
using std::max;
using std::vector;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
using namespace dcpomatic;
using boost::optional;
using namespace dcpomatic;
@@
-158,7
+158,7
@@
DCPOMATIC_ENABLE_WARNINGS
av_packet_unref (&_packet);
av_packet_unref (&_packet);
- if (_first_video && got_all_audio && temporal_reference.size() >=
PULLDOWN_CHECK_FRAMES
) {
+ if (_first_video && got_all_audio && temporal_reference.size() >=
(PULLDOWN_CHECK_FRAMES * 2)
) {
/* All done */
break;
}
/* All done */
break;
}
@@
-184,8
+184,6
@@
DCPOMATIC_ENABLE_WARNINGS
}
_rotation = *_rotation - 360 * floor (*_rotation / 360 + 0.9 / 360);
}
_rotation = *_rotation - 360 * floor (*_rotation / 360 + 0.9 / 360);
-
- DCPOMATIC_ASSERT (fabs (*_rotation - 90 * round (*_rotation / 90)) < 2);
}
LOG_GENERAL("Temporal reference was %1", temporal_reference);
}
LOG_GENERAL("Temporal reference was %1", temporal_reference);
@@
-194,13
+192,6
@@
DCPOMATIC_ENABLE_WARNINGS
_pulldown = true;
LOG_GENERAL_NC("Suggest that this may be 2:3 pull-down (soft telecine)");
}
_pulldown = true;
LOG_GENERAL_NC("Suggest that this may be 2:3 pull-down (soft telecine)");
}
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- AVDictionaryEntry* e = av_dict_get (_format_context->metadata, SWAROOP_ID_TAG, 0, 0);
- if (e) {
- _id = e->value;
- }
-#endif
}
}
@@
-213,7
+204,7
@@
FFmpegExaminer::video_packet (AVCodecContext* context, string& temporal_referenc
{
DCPOMATIC_ASSERT (_video_stream);
{
DCPOMATIC_ASSERT (_video_stream);
- if (_first_video && !_need_video_length && temporal_reference.size() >=
PULLDOWN_CHECK_FRAMES
) {
+ if (_first_video && !_need_video_length && temporal_reference.size() >=
(PULLDOWN_CHECK_FRAMES * 2)
) {
return;
}
return;
}
@@
-229,7
+220,7
@@
DCPOMATIC_ENABLE_WARNINGS
_format_context->streams[_video_stream.get()]
).get_value_or (ContentTime ()).frames_round (video_frame_rate().get ());
}
_format_context->streams[_video_stream.get()]
).get_value_or (ContentTime ()).frames_round (video_frame_rate().get ());
}
- if (temporal_reference.size() <
PULLDOWN_CHECK_FRAMES
) {
+ if (temporal_reference.size() <
(PULLDOWN_CHECK_FRAMES * 2)
) {
temporal_reference += (_frame->top_field_first ? "T" : "B");
temporal_reference += (_frame->repeat_pict ? "3" : "2");
}
temporal_reference += (_frame->top_field_first ? "T" : "B");
temporal_reference += (_frame->repeat_pict ? "3" : "2");
}