Attachment #740799 for bug #814443

View | Details | Raw Unified | Return to bug 814443
Collapse All | Expand All

Lines 29-34 extern "C" { Link Here

(-)a/media/ffmpeg/ffmpeg_common.h (+1 lines)
29	#include <libavformat/avformat.h>	29	#include <libavformat/avformat.h>
30	#include <libavformat/avio.h>	30	#include <libavformat/avio.h>
31	#include <libavutil/avutil.h>	31	#include <libavutil/avutil.h>
		32	#include <libavutil/channel_layout.h>
32	#include <libavutil/imgutils.h>	33	#include <libavutil/imgutils.h>
33	#include <libavutil/log.h>	34	#include <libavutil/log.h>
34	#include <libavutil/mastering_display_metadata.h>	35	#include <libavutil/mastering_display_metadata.h>





  // Next try to use the first DTS value, for codecs where we know PTS == DTS
  // (excludes all H26x codecs). The start time must be returned in PTS.
  if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
      stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
      stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
      stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
    const base::TimeDelta first_pts =
        ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
    if (first_pts < start_time)
      start_time = first_pts;
  }

Return to bug 814443

Lines 106-117 static base::TimeDelta ExtractStartTime(AVStream* stream) { Link Here

(-)a/media/filters/ffmpeg_demuxer.cc (-2 / +2 lines)
106		106
107	// Next try to use the first DTS value, for codecs where we know PTS == DTS	107	// Next try to use the first DTS value, for codecs where we know PTS == DTS
108	// (excludes all H26x codecs). The start time must be returned in PTS.	108	// (excludes all H26x codecs). The start time must be returned in PTS.
109	if (stream->first_dts != kNoFFmpegTimestamp &&	109	if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
110	stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&	110	stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
111	stream->codecpar->codec_id != AV_CODEC_ID_H264 &&	111	stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
112	stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {	112	stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
113	const base::TimeDelta first_pts =	113	const base::TimeDelta first_pts =
114	ConvertFromTimeBase(stream->time_base, stream->first_dts);	114	ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
115	if (first_pts < start_time)	115	if (first_pts < start_time)
116	start_time = first_pts;	116	start_time = first_pts;
117	}	117	}