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

Unified Diff: media/mp4/box_definitions.cc

Issue 27374002: Add support for avc3 codec string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reupload Created 7 years, 2 months 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
Index: media/mp4/box_definitions.cc
diff --git a/media/mp4/box_definitions.cc b/media/mp4/box_definitions.cc
index e7f169323bb6b90a94854d9bfe9ce55bc07bcd3e..218e5bb09205c8c46b35d92631a4e199c1671e53 100644
--- a/media/mp4/box_definitions.cc
+++ b/media/mp4/box_definitions.cc
@@ -399,13 +399,18 @@ bool VideoSampleEntry::Parse(BoxReader* reader) {
}
}
- if (format == FOURCC_AVC1 ||
- (format == FOURCC_ENCV && sinf.format.format == FOURCC_AVC1)) {
+ if (IsFormatValid())
RCHECK(reader->ReadChild(&avcc));
- }
+
return true;
}
+bool VideoSampleEntry::IsFormatValid() const {
+ return format == FOURCC_AVC1 || format == FOURCC_AVC3 ||
+ (format == FOURCC_ENCV && (sinf.format.format == FOURCC_AVC1 ||
+ sinf.format.format == FOURCC_AVC3));
+}
+
ElementaryStreamDescriptor::ElementaryStreamDescriptor()
: object_type(kForbidden) {}

Powered by Google App Engine
This is Rietveld 408576698