Revert 113895 - <video> decode in hardware!

media/ffmpeg/ffmpeg_common.cc

 // Copyright (c) 2011 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/logging.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/video_decoder_config.h"
 
@@ skipping 109 matching lines @@
     case kCodecMPEG4:
       return CODEC_ID_MPEG4;
     case kCodecVP8:
       return CODEC_ID_VP8;
     default:
       NOTREACHED();
   }
   return CODEC_ID_NONE;
 }
 
-static VideoCodecProfile ProfileIDToVideoCodecProfile(int profile) {
-  switch (profile) {
-    case FF_PROFILE_H264_BASELINE:
-      return H264PROFILE_BASELINE;
-    case FF_PROFILE_H264_MAIN:
-      return H264PROFILE_MAIN;
-    case FF_PROFILE_H264_EXTENDED:
-      return H264PROFILE_EXTENDED;
-    case FF_PROFILE_H264_HIGH:
-      return H264PROFILE_HIGH;
-    case FF_PROFILE_H264_HIGH_10:
-      return H264PROFILE_HIGH10PROFILE;
-    case FF_PROFILE_H264_HIGH_422:
-      return H264PROFILE_HIGH422PROFILE;
-    case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
-      return H264PROFILE_HIGH444PREDICTIVEPROFILE;
-    default:
-      return VIDEO_CODEC_PROFILE_UNKNOWN;
-  }
-}
-
-static int VideoCodecProfileToProfileID(VideoCodecProfile profile) {
-  switch (profile) {
-    case H264PROFILE_BASELINE:
-      return FF_PROFILE_H264_BASELINE;
-    case H264PROFILE_MAIN:
-      return FF_PROFILE_H264_MAIN;
-    case H264PROFILE_EXTENDED:
-      return FF_PROFILE_H264_EXTENDED;
-    case H264PROFILE_HIGH:
-      return FF_PROFILE_H264_HIGH;
-    case H264PROFILE_HIGH10PROFILE:
-      return FF_PROFILE_H264_HIGH_10;
-    case H264PROFILE_HIGH422PROFILE:
-      return FF_PROFILE_H264_HIGH_422;
-    case H264PROFILE_HIGH444PREDICTIVEPROFILE:
-      return FF_PROFILE_H264_HIGH_444_PREDICTIVE;
-    default:
-      return FF_PROFILE_UNKNOWN;
-  }
-}
-
 void AVCodecContextToAudioDecoderConfig(
     const AVCodecContext* codec_context,
     AudioDecoderConfig* config) {
   DCHECK_EQ(codec_context->codec_type, AVMEDIA_TYPE_AUDIO);
 
   AudioCodec codec = CodecIDToAudioCodec(codec_context->codec_id);
   int bits_per_channel = av_get_bits_per_sample_fmt(codec_context->sample_fmt);
   ChannelLayout channel_layout =
       ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
                                          codec_context->channels);
@@ skipping 57 matching lines @@
   // for now, but may not always be true forever. Fix this in the future.
   gfx::Rect visible_rect(stream->codec->width, stream->codec->height);
 
   AVRational aspect_ratio = { 1, 1 };
   if (stream->sample_aspect_ratio.num)
     aspect_ratio = stream->sample_aspect_ratio;
   else if (stream->codec->sample_aspect_ratio.num)
     aspect_ratio = stream->codec->sample_aspect_ratio;
 
   config->Initialize(CodecIDToVideoCodec(stream->codec->codec_id),
-                     ProfileIDToVideoCodecProfile(stream->codec->profile),
                      PixelFormatToVideoFormat(stream->codec->pix_fmt),
                      coded_size, visible_rect,
                      stream->r_frame_rate.num,
                      stream->r_frame_rate.den,
                      aspect_ratio.num,
                      aspect_ratio.den,
                      stream->codec->extradata,
                      stream->codec->extradata_size);
 }
 
 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();
   codec_context->pix_fmt = VideoFormatToPixelFormat(config.format());
 
   if (config.extra_data()) {
     codec_context->extradata_size = config.extra_data_size();
     codec_context->extradata = reinterpret_cast<uint8_t*>(
         av_malloc(config.extra_data_size() + FF_INPUT_BUFFER_PADDING_SIZE));
     memcpy(codec_context->extradata, config.extra_data(),
            config.extra_data_size());
@@ skipping 102 matching lines @@
         avcodec_close(stream->codec);
       }
     }
   }
 
   // Then finally cleanup the format context.
   av_close_input_file(format_context);
 }
 
 }  // namespace media