summaryrefslogtreecommitdiffstats
path: root/media/webm
diff options
context:
space:
mode:
authortomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-11 20:07:43 +0000
committertomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-11 20:07:43 +0000
commitbbf5a5f7a51e6d35b91b7565019decfc2c43fa67 (patch)
treea1529134b7c8ac6e5e0529b1a8b7a0888c065d89 /media/webm
parentf66112f51641cd6c637b1cafb22797f742060168 (diff)
downloadchromium_src-bbf5a5f7a51e6d35b91b7565019decfc2c43fa67.zip
chromium_src-bbf5a5f7a51e6d35b91b7565019decfc2c43fa67.tar.gz
chromium_src-bbf5a5f7a51e6d35b91b7565019decfc2c43fa67.tar.bz2
media source: Support WebM streams containing a FrameRate element.
Add parsing support for the FrameRate element, and avoid the confusing situation where a WebM file plays back in a standard video element, but is unplayable when using MSE. Review URL: https://chromiumcodereview.appspot.com/23532051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
-rw-r--r--media/webm/webm_constants.h1
-rw-r--r--media/webm/webm_parser.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/media/webm/webm_constants.h b/media/webm/webm_constants.h
index 8764eeb..3a35dba 100644
--- a/media/webm/webm_constants.h
+++ b/media/webm/webm_constants.h
@@ -120,6 +120,7 @@ const int kWebMIdFlagEnabled = 0xB9;
const int kWebMIdFlagForced = 0x55AA;
const int kWebMIdFlagInterlaced = 0x9A;
const int kWebMIdFlagLacing = 0x9C;
+const int kWebMIdFrameRate = 0x2383E3;
const int kWebMIdInfo = 0x1549A966;
const int kWebMIdJoinBlocks = 0xE9;
const int kWebMIdLaceNumber = 0xCC;
diff --git a/media/webm/webm_parser.cc b/media/webm/webm_parser.cc
index ab41e2a..f1509ab 100644
--- a/media/webm/webm_parser.cc
+++ b/media/webm/webm_parser.cc
@@ -194,6 +194,7 @@ static const ElementIdInfo kVideoIds[] = {
{UINT, kWebMIdDisplayUnit},
{UINT, kWebMIdAspectRatioType},
{BINARY, kWebMIdColorSpace},
+ {FLOAT, kWebMIdFrameRate},
};
static const ElementIdInfo kAudioIds[] = {