Update to Pipeline Metadata and Decoder Stream for Orientation Data

media/ffmpeg/ffmpeg_common.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/ffmpeg/ffmpeg_common.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 393 matching lines @@
     coded_size.set_width((coded_size.width() + 1) / 2 * 2);
     if (format != VideoFrame::YV16)
       coded_size.set_height((coded_size.height() + 1) / 2 * 2);
   }
 
   bool is_encrypted = false;
   AVDictionaryEntry* key = av_dict_get(stream->metadata, "enc_key_id", NULL, 0);
   if (key)
     is_encrypted = true;
 
+  AVDictionaryEntry* rotation_entry =
+      av_dict_get(stream->metadata, "rotate", NULL, 0);
+  int rotation = 0;
+  if (rotation_entry && rotation_entry->value && rotation_entry->value[0])
+    base::StringToInt(rotation_entry->value, &rotation);
+
+  DCHECK(rotation == 0 || rotation == 90 || rotation == 180 || rotation == 270);

[scherkus (not reviewing), 2014/07/07 20:52:38]

are we certain FFmpeg can't spit out values other than these 4?

if we aren't, then we should fail gracefully in the default section below (e.g.,
LOG(ERROR) << "Unsupported video rotation: " << rotation;)

+
   AVDictionaryEntry* webm_alpha =
       av_dict_get(stream->metadata, "alpha_mode", NULL, 0);
   if (webm_alpha && !strcmp(webm_alpha->value, "1")) {
     format = VideoFrame::YV12A;
   }
 
   config->Initialize(codec,
                      profile,
                      format,
                      coded_size, visible_rect, natural_size,
                      stream->codec->extradata, stream->codec->extradata_size,
                      is_encrypted,
                      record_stats);
+
+  switch (rotation) {
+    case 0:
+      config->set_rotation(kRotate0);
+      break;
+    case 90:
+      config->set_rotation(kRotate90);
+      break;
+    case 180:
+      config->set_rotation(kRotate180);
+      break;
+    case 270:
+      config->set_rotation(kRotate270);
+    default:
+      break;
+  }
 }
 
 void VideoDecoderConfigToAVCodecContext(
     const VideoDecoderConfig& config,
     AVCodecContext* codec_context) {
   codec_context->codec_type = AVMEDIA_TYPE_VIDEO;
   codec_context->codec_id = VideoCodecToCodecID(config.codec());
   codec_context->profile = VideoCodecProfileToProfileID(config.profile());
   codec_context->coded_width = config.coded_size().width();
   codec_context->coded_height = config.coded_size().height();
@@ skipping 141 matching lines @@
       return false;
 
     *out = parsed_time;
     return true;
   }
 
   return false;
 }
 
 }  // namespace media