Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 736873002: FOR TESTING ONLY: Enable ffvp9 inside of Chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 5fdd9c05792e86072afb2ab1328e977ca0f745b6..433cbf93830f39a20da149af5c3d9e913f443498 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -348,9 +348,12 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
// Fixing chained ogg is non-trivial, so for now just reuse the last good
// timestamp. The decoder will rewrite the timestamps to be sample accurate
// later. See http://crbug.com/396864.
- if (fixup_negative_ogg_timestamps_ &&
- (buffer->timestamp() == kNoTimestamp() ||
- buffer->timestamp() < last_packet_timestamp_)) {
+ //
+ // TODO(dalecurtis): ffvp9 packet parser generates AV_NOPTS packets when a
+ // superframe is split, so adjust timestamps here...
+ if ((fixup_negative_ogg_timestamps_ ||
+ buffer->timestamp() == kNoTimestamp()) &&
+ (buffer->timestamp() < last_packet_timestamp_)) {
buffer->set_timestamp(last_packet_timestamp_ +
(last_packet_duration_ != kNoTimestamp()
? last_packet_duration_
« no previous file with comments | « no previous file | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698