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

Unified Diff: source/libvpx/webmenc.cc

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « source/libvpx/webmdec.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/webmenc.cc
diff --git a/source/libvpx/webmenc.cc b/source/libvpx/webmenc.cc
index 8212ee36cf62c031509f6425257434e24a87f336..d41e700443c6cf941f61fe9171687508257498c6 100644
--- a/source/libvpx/webmenc.cc
+++ b/source/libvpx/webmenc.cc
@@ -49,7 +49,22 @@ void write_webm_file_header(struct EbmlGlobal *glob,
static_cast<mkvmuxer::VideoTrack*>(
segment->GetTrackByNumber(video_track_id));
video_track->SetStereoMode(stereo_fmt);
- video_track->set_codec_id(fourcc == VP8_FOURCC ? "V_VP8" : "V_VP9");
+ const char *codec_id;
+ switch (fourcc) {
+ case VP8_FOURCC:
+ codec_id = "V_VP8";
+ break;
+ case VP9_FOURCC:
+ codec_id = "V_VP9";
+ break;
+ case VP10_FOURCC:
+ codec_id = "V_VP10";
+ break;
+ default:
+ codec_id = "V_VP10";
+ break;
+ }
+ video_track->set_codec_id(codec_id);
if (par->numerator > 1 || par->denominator > 1) {
// TODO(fgalligan): Add support of DisplayUnit, Display Aspect Ratio type
// to WebM format.
« no previous file with comments | « source/libvpx/webmdec.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698