mirror of https://github.com/FFmpeg/FFmpeg.git
Implemented according to the draft specification "VP Codec ISO Media File Format Binding": http://www.webmproject.org/vp9/#draft-vp-codec-iso-media-file-format-binding '-strict -2' is required to use this feature. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>pull/221/head
Kongqun Yang
9 years ago
committed by
Ronald S. Bultje
parent
7f1b503ec2
commit
54327c2b34
5 changed files with 225 additions and 1 deletions
@ -0,0 +1,148 @@ |
||||
/*
|
||||
* Copyright (c) 2016 Google Inc. |
||||
* Copyright (c) 2016 KongQun Yang (kqyang@google.com) |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#include "libavutil/pixdesc.h" |
||||
#include "libavutil/pixfmt.h" |
||||
#include "vpcc.h" |
||||
|
||||
enum VpxColorSpace |
||||
{ |
||||
VPX_COLOR_SPACE_UNSPECIFIED = 0, |
||||
VPX_COLOR_SPACE_BT601 = 1, |
||||
VPX_COLOR_SPACE_BT709 = 2, |
||||
VPX_COLOR_SPACE_SMPTE_170 = 3, |
||||
VPX_COLOR_SPACE_SMPTE_240 = 4, |
||||
VPX_COLOR_SPACE_BT2020_NCL = 5, |
||||
VPX_COLOR_SPACE_BT2020_CL = 6, |
||||
VPX_COLOR_SPACE_RGB = 7, |
||||
}; |
||||
|
||||
static int get_vpx_color_space(AVFormatContext *s, |
||||
enum AVColorSpace color_space) |
||||
{ |
||||
switch (color_space) { |
||||
case AVCOL_SPC_RGB: |
||||
return VPX_COLOR_SPACE_RGB; |
||||
case AVCOL_SPC_BT709: |
||||
return VPX_COLOR_SPACE_BT709; |
||||
case AVCOL_SPC_UNSPECIFIED: |
||||
return VPX_COLOR_SPACE_UNSPECIFIED; |
||||
case AVCOL_SPC_BT470BG: |
||||
return VPX_COLOR_SPACE_BT601; |
||||
case AVCOL_SPC_SMPTE170M: |
||||
return VPX_COLOR_SPACE_SMPTE_170; |
||||
case AVCOL_SPC_SMPTE240M: |
||||
return VPX_COLOR_SPACE_SMPTE_240; |
||||
case AVCOL_SPC_BT2020_NCL: |
||||
return VPX_COLOR_SPACE_BT2020_NCL; |
||||
case AVCOL_SPC_BT2020_CL: |
||||
return VPX_COLOR_SPACE_BT2020_CL; |
||||
default: |
||||
av_log(s, AV_LOG_ERROR, "Unsupported color space (%d)\n", color_space); |
||||
return -1; |
||||
} |
||||
} |
||||
|
||||
enum VPX_CHROMA_SUBSAMPLING |
||||
{ |
||||
VPX_SUBSAMPLING_420_VERTICAL = 0, |
||||
VPX_SUBSAMPLING_420_COLLOCATED_WITH_LUMA = 1, |
||||
VPX_SUBSAMPLING_422 = 2, |
||||
VPX_SUBSAMPLING_444 = 3, |
||||
}; |
||||
|
||||
static int get_vpx_chroma_subsampling(AVFormatContext *s, |
||||
enum AVPixelFormat pixel_format, |
||||
enum AVChromaLocation chroma_location) |
||||
{ |
||||
int chroma_w, chroma_h; |
||||
if (av_pix_fmt_get_chroma_sub_sample(pixel_format, &chroma_w, &chroma_h) == 0) { |
||||
if (chroma_w == 1 && chroma_h == 1) { |
||||
return (chroma_location == AVCHROMA_LOC_LEFT) |
||||
? VPX_SUBSAMPLING_420_VERTICAL |
||||
: VPX_SUBSAMPLING_420_COLLOCATED_WITH_LUMA; |
||||
} else if (chroma_w == 1 && chroma_h == 0) { |
||||
return VPX_SUBSAMPLING_422; |
||||
} else if (chroma_w == 0 && chroma_h == 0) { |
||||
return VPX_SUBSAMPLING_444; |
||||
} |
||||
} |
||||
av_log(s, AV_LOG_ERROR, "Unsupported pixel format (%d)\n", pixel_format); |
||||
return -1; |
||||
} |
||||
|
||||
static int get_bit_depth(AVFormatContext *s, enum AVPixelFormat pixel_format) |
||||
{ |
||||
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pixel_format); |
||||
if (desc == NULL) { |
||||
av_log(s, AV_LOG_ERROR, "Unsupported pixel format (%d)\n", |
||||
pixel_format); |
||||
return -1; |
||||
} |
||||
return desc->comp[0].depth; |
||||
} |
||||
|
||||
static int get_vpx_transfer_function( |
||||
enum AVColorTransferCharacteristic transfer) |
||||
{ |
||||
return transfer == AVCOL_TRC_SMPTEST2084; |
||||
} |
||||
|
||||
static int get_vpx_video_full_range_flag(enum AVColorRange color_range) |
||||
{ |
||||
return color_range == AVCOL_RANGE_JPEG; |
||||
} |
||||
|
||||
int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb, |
||||
AVCodecParameters *par) |
||||
{ |
||||
int profile = par->profile; |
||||
int level = par->level == FF_LEVEL_UNKNOWN ? 0 : par->level; |
||||
int bit_depth = get_bit_depth(s, par->format); |
||||
int vpx_color_space = get_vpx_color_space(s, par->color_space); |
||||
int vpx_chroma_subsampling = |
||||
get_vpx_chroma_subsampling(s, par->format, par->chroma_location); |
||||
int vpx_transfer_function = get_vpx_transfer_function(par->color_trc); |
||||
int vpx_video_full_range_flag = |
||||
get_vpx_video_full_range_flag(par->color_range); |
||||
|
||||
if (bit_depth < 0 || vpx_color_space < 0 || vpx_chroma_subsampling < 0) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
if (profile == FF_PROFILE_UNKNOWN) { |
||||
if (vpx_chroma_subsampling == VPX_SUBSAMPLING_420_VERTICAL || |
||||
vpx_chroma_subsampling == VPX_SUBSAMPLING_420_COLLOCATED_WITH_LUMA) { |
||||
profile = (bit_depth == 8) ? FF_PROFILE_VP9_0 : FF_PROFILE_VP9_2; |
||||
} else { |
||||
profile = (bit_depth == 8) ? FF_PROFILE_VP9_1 : FF_PROFILE_VP9_3; |
||||
} |
||||
} |
||||
|
||||
avio_w8(pb, profile); |
||||
avio_w8(pb, level); |
||||
avio_w8(pb, (bit_depth << 4) | vpx_color_space); |
||||
avio_w8(pb, (vpx_chroma_subsampling << 4) | (vpx_transfer_function << 1) | |
||||
vpx_video_full_range_flag); |
||||
|
||||
// vp9 does not have codec initialization data.
|
||||
avio_wb16(pb, 0); |
||||
return 0; |
||||
} |
||||
@ -0,0 +1,47 @@ |
||||
/*
|
||||
* Copyright (c) 2016 Google Inc. |
||||
* Copyright (c) 2016 KongQun Yang (kqyang@google.com) |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
/**
|
||||
* @file |
||||
* internal header for VPx codec configuration utilities. |
||||
*/ |
||||
|
||||
#ifndef AVFORMAT_VPCC_H |
||||
#define AVFORMAT_VPCC_H |
||||
|
||||
#include <stdint.h> |
||||
#include "avio.h" |
||||
#include "avformat.h" |
||||
#include "libavcodec/avcodec.h" |
||||
|
||||
/**
|
||||
* Writes VP codec configuration to the provided AVIOContext. |
||||
* |
||||
* @param s address of the AVFormatContext for the logging context. |
||||
* @param pb address of the AVIOContext where the vpcC shall be written. |
||||
* @param par address of the AVCodecParameters which contains codec information. |
||||
* @return >=0 in case of success, a negative value corresponding to an AVERROR |
||||
* code in case of failure |
||||
*/ |
||||
int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb, |
||||
AVCodecParameters *par); |
||||
|
||||
#endif /* AVFORMAT_VPCC_H */ |
||||
Loading…
Reference in new issue