mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02:00
80e9e63c94
* commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
315 lines
12 KiB
C
315 lines
12 KiB
C
/*
|
|
* LPCM codecs for PCM formats found in MPEG streams
|
|
* Copyright (c) 2009 Christian Schmidt
|
|
*
|
|
* 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
|
|
* PCM codecs for encodings found in MPEG streams (DVD/Blu-ray)
|
|
*/
|
|
|
|
#include "libavutil/channel_layout.h"
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "internal.h"
|
|
|
|
/*
|
|
* Channel Mapping according to
|
|
* Blu-ray Disc Read-Only Format Version 1
|
|
* Part 3: Audio Visual Basic Specifications
|
|
* mono M1 X
|
|
* stereo L R
|
|
* 3/0 L R C X
|
|
* 2/1 L R S X
|
|
* 3/1 L R C S
|
|
* 2/2 L R LS RS
|
|
* 3/2 L R C LS RS X
|
|
* 3/2+lfe L R C LS RS lfe
|
|
* 3/4 L R C LS Rls Rrs RS X
|
|
* 3/4+lfe L R C LS Rls Rrs RS lfe
|
|
*/
|
|
|
|
/**
|
|
* Parse the header of a LPCM frame read from a MPEG-TS stream
|
|
* @param avctx the codec context
|
|
* @param header pointer to the first four bytes of the data packet
|
|
*/
|
|
static int pcm_bluray_parse_header(AVCodecContext *avctx,
|
|
const uint8_t *header)
|
|
{
|
|
static const uint8_t bits_per_samples[4] = { 0, 16, 20, 24 };
|
|
static const uint32_t channel_layouts[16] = {
|
|
0, AV_CH_LAYOUT_MONO, 0, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_SURROUND,
|
|
AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_2_2, AV_CH_LAYOUT_5POINT0,
|
|
AV_CH_LAYOUT_5POINT1, AV_CH_LAYOUT_7POINT0, AV_CH_LAYOUT_7POINT1, 0, 0, 0, 0
|
|
};
|
|
static const uint8_t channels[16] = {
|
|
0, 1, 0, 2, 3, 3, 4, 4, 5, 6, 7, 8, 0, 0, 0, 0
|
|
};
|
|
uint8_t channel_layout = header[2] >> 4;
|
|
|
|
if (avctx->debug & FF_DEBUG_PICT_INFO)
|
|
av_dlog(avctx, "pcm_bluray_parse_header: header = %02x%02x%02x%02x\n",
|
|
header[0], header[1], header[2], header[3]);
|
|
|
|
/* get the sample depth and derive the sample format from it */
|
|
avctx->bits_per_coded_sample = bits_per_samples[header[3] >> 6];
|
|
if (!(avctx->bits_per_coded_sample == 16 || avctx->bits_per_coded_sample == 24)) {
|
|
av_log(avctx, AV_LOG_ERROR, "unsupported sample depth (%d)\n", avctx->bits_per_coded_sample);
|
|
return -1;
|
|
}
|
|
avctx->sample_fmt = avctx->bits_per_coded_sample == 16 ? AV_SAMPLE_FMT_S16 :
|
|
AV_SAMPLE_FMT_S32;
|
|
if (avctx->sample_fmt == AV_SAMPLE_FMT_S32)
|
|
avctx->bits_per_raw_sample = avctx->bits_per_coded_sample;
|
|
|
|
/* get the sample rate. Not all values are used. */
|
|
switch (header[2] & 0x0f) {
|
|
case 1:
|
|
avctx->sample_rate = 48000;
|
|
break;
|
|
case 4:
|
|
avctx->sample_rate = 96000;
|
|
break;
|
|
case 5:
|
|
avctx->sample_rate = 192000;
|
|
break;
|
|
default:
|
|
avctx->sample_rate = 0;
|
|
av_log(avctx, AV_LOG_ERROR, "reserved sample rate (%d)\n",
|
|
header[2] & 0x0f);
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
* get the channel number (and mapping). Not all values are used.
|
|
* It must be noted that the number of channels in the MPEG stream can
|
|
* differ from the actual meaningful number, e.g. mono audio still has two
|
|
* channels, one being empty.
|
|
*/
|
|
avctx->channel_layout = channel_layouts[channel_layout];
|
|
avctx->channels = channels[channel_layout];
|
|
if (!avctx->channels) {
|
|
av_log(avctx, AV_LOG_ERROR, "reserved channel configuration (%d)\n",
|
|
channel_layout);
|
|
return -1;
|
|
}
|
|
|
|
avctx->bit_rate = FFALIGN(avctx->channels, 2) * avctx->sample_rate *
|
|
avctx->bits_per_coded_sample;
|
|
|
|
if (avctx->debug & FF_DEBUG_PICT_INFO)
|
|
av_dlog(avctx,
|
|
"pcm_bluray_parse_header: %d channels, %d bits per sample, %d Hz, %d bit/s\n",
|
|
avctx->channels, avctx->bits_per_coded_sample,
|
|
avctx->sample_rate, avctx->bit_rate);
|
|
return 0;
|
|
}
|
|
|
|
static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data,
|
|
int *got_frame_ptr, AVPacket *avpkt)
|
|
{
|
|
AVFrame *frame = data;
|
|
const uint8_t *src = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
GetByteContext gb;
|
|
int num_source_channels, channel, retval;
|
|
int sample_size, samples;
|
|
int16_t *dst16;
|
|
int32_t *dst32;
|
|
|
|
if (buf_size < 4) {
|
|
av_log(avctx, AV_LOG_ERROR, "PCM packet too small\n");
|
|
return -1;
|
|
}
|
|
|
|
if (pcm_bluray_parse_header(avctx, src))
|
|
return -1;
|
|
src += 4;
|
|
buf_size -= 4;
|
|
|
|
bytestream2_init(&gb, src, buf_size);
|
|
|
|
/* There's always an even number of channels in the source */
|
|
num_source_channels = FFALIGN(avctx->channels, 2);
|
|
sample_size = (num_source_channels * (avctx->sample_fmt == AV_SAMPLE_FMT_S16 ? 16 : 24)) >> 3;
|
|
samples = buf_size / sample_size;
|
|
|
|
/* get output buffer */
|
|
frame->nb_samples = samples;
|
|
if ((retval = ff_get_buffer(avctx, frame, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return retval;
|
|
}
|
|
dst16 = (int16_t *)frame->data[0];
|
|
dst32 = (int32_t *)frame->data[0];
|
|
|
|
if (samples) {
|
|
switch (avctx->channel_layout) {
|
|
/* cases with same number of source and coded channels */
|
|
case AV_CH_LAYOUT_STEREO:
|
|
case AV_CH_LAYOUT_4POINT0:
|
|
case AV_CH_LAYOUT_2_2:
|
|
samples *= num_source_channels;
|
|
if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
|
|
#if HAVE_BIGENDIAN
|
|
bytestream2_get_buffer(&gb, dst16, buf_size);
|
|
#else
|
|
do {
|
|
*dst16++ = bytestream2_get_be16u(&gb);
|
|
} while (--samples);
|
|
#endif
|
|
} else {
|
|
do {
|
|
*dst32++ = bytestream2_get_be24u(&gb) << 8;
|
|
} while (--samples);
|
|
}
|
|
break;
|
|
/* cases where number of source channels = coded channels + 1 */
|
|
case AV_CH_LAYOUT_MONO:
|
|
case AV_CH_LAYOUT_SURROUND:
|
|
case AV_CH_LAYOUT_2_1:
|
|
case AV_CH_LAYOUT_5POINT0:
|
|
if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
|
|
do {
|
|
#if HAVE_BIGENDIAN
|
|
bytestream2_get_buffer(&gb, dst16, avctx->channels * 2);
|
|
dst16 += avctx->channels;
|
|
#else
|
|
channel = avctx->channels;
|
|
do {
|
|
*dst16++ = bytestream2_get_be16u(&gb);
|
|
} while (--channel);
|
|
#endif
|
|
bytestream2_skip(&gb, 2);
|
|
} while (--samples);
|
|
} else {
|
|
do {
|
|
channel = avctx->channels;
|
|
do {
|
|
*dst32++ = bytestream2_get_be24u(&gb) << 8;
|
|
} while (--channel);
|
|
bytestream2_skip(&gb, 3);
|
|
} while (--samples);
|
|
}
|
|
break;
|
|
/* remapping: L, R, C, LBack, RBack, LF */
|
|
case AV_CH_LAYOUT_5POINT1:
|
|
if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
|
|
do {
|
|
dst16[0] = bytestream2_get_be16u(&gb);
|
|
dst16[1] = bytestream2_get_be16u(&gb);
|
|
dst16[2] = bytestream2_get_be16u(&gb);
|
|
dst16[4] = bytestream2_get_be16u(&gb);
|
|
dst16[5] = bytestream2_get_be16u(&gb);
|
|
dst16[3] = bytestream2_get_be16u(&gb);
|
|
dst16 += 6;
|
|
} while (--samples);
|
|
} else {
|
|
do {
|
|
dst32[0] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[1] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[2] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[4] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[5] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[3] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32 += 6;
|
|
} while (--samples);
|
|
}
|
|
break;
|
|
/* remapping: L, R, C, LSide, LBack, RBack, RSide, <unused> */
|
|
case AV_CH_LAYOUT_7POINT0:
|
|
if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
|
|
do {
|
|
dst16[0] = bytestream2_get_be16u(&gb);
|
|
dst16[1] = bytestream2_get_be16u(&gb);
|
|
dst16[2] = bytestream2_get_be16u(&gb);
|
|
dst16[5] = bytestream2_get_be16u(&gb);
|
|
dst16[3] = bytestream2_get_be16u(&gb);
|
|
dst16[4] = bytestream2_get_be16u(&gb);
|
|
dst16[6] = bytestream2_get_be16u(&gb);
|
|
dst16 += 7;
|
|
bytestream2_skip(&gb, 2);
|
|
} while (--samples);
|
|
} else {
|
|
do {
|
|
dst32[0] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[1] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[2] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[5] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[3] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[4] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[6] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32 += 7;
|
|
bytestream2_skip(&gb, 3);
|
|
} while (--samples);
|
|
}
|
|
break;
|
|
/* remapping: L, R, C, LSide, LBack, RBack, RSide, LF */
|
|
case AV_CH_LAYOUT_7POINT1:
|
|
if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
|
|
do {
|
|
dst16[0] = bytestream2_get_be16u(&gb);
|
|
dst16[1] = bytestream2_get_be16u(&gb);
|
|
dst16[2] = bytestream2_get_be16u(&gb);
|
|
dst16[6] = bytestream2_get_be16u(&gb);
|
|
dst16[4] = bytestream2_get_be16u(&gb);
|
|
dst16[5] = bytestream2_get_be16u(&gb);
|
|
dst16[7] = bytestream2_get_be16u(&gb);
|
|
dst16[3] = bytestream2_get_be16u(&gb);
|
|
dst16 += 8;
|
|
} while (--samples);
|
|
} else {
|
|
do {
|
|
dst32[0] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[1] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[2] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[6] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[4] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[5] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[7] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32[3] = bytestream2_get_be24u(&gb) << 8;
|
|
dst32 += 8;
|
|
} while (--samples);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
*got_frame_ptr = 1;
|
|
|
|
retval = bytestream2_tell(&gb);
|
|
if (avctx->debug & FF_DEBUG_BITSTREAM)
|
|
av_dlog(avctx, "pcm_bluray_decode_frame: decoded %d -> %d bytes\n",
|
|
retval, buf_size);
|
|
return retval + 4;
|
|
}
|
|
|
|
AVCodec ff_pcm_bluray_decoder = {
|
|
.name = "pcm_bluray",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = AV_CODEC_ID_PCM_BLURAY,
|
|
.decode = pcm_bluray_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.sample_fmts = (const enum AVSampleFormat[]){
|
|
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE
|
|
},
|
|
.long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"),
|
|
};
|