virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lxf: remove deplanarization hack

Browse Source 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
This commit is contained in:
Paul B Mahol
2012-11-16 15:10:36 +00:00
committed by Luca Barbato
parent 7e52080cb1
commit a529fa2f4d
1 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libavformat/lxfdec.c
View File

@@ -29,7 +29,6 @@
#define LXF_IDENT "LEITCH\0" #define LXF_IDENT "LEITCH\0"
#define LXF_IDENT_LENGTH 8 #define LXF_IDENT_LENGTH 8
#define LXF_SAMPLERATE 48000 #define LXF_SAMPLERATE 48000
#define LXF_MAX_AUDIO_PACKET (8008*15*4) ///< 15-channel 32-bit NTSC audio frame
static const AVCodecTag lxf_tags[] = { static const AVCodecTag lxf_tags[] = {
{ AV_CODEC_ID_MJPEG, 0 }, { AV_CODEC_ID_MJPEG, 0 },
@@ -47,7 +46,6 @@ static const AVCodecTag lxf_tags[] = {
typedef struct { typedef struct {
int channels; ///< number of audio channels. zero means no audio int channels; ///< number of audio channels. zero means no audio
uint8_t temp[LXF_MAX_AUDIO_PACKET]; ///< temp buffer for de-planarizing the audio data
int frame_number; ///< current video frame int frame_number; ///< current video frame
uint32_t video_format, packet_type, extended_size; uint32_t video_format, packet_type, extended_size;
} LXFDemuxContext; } LXFDemuxContext;
@@ -183,10 +181,10 @@ static int get_packet_header(AVFormatContext *s)
} }
switch (st->codec->bits_per_coded_sample) { switch (st->codec->bits_per_coded_sample) {
case 16: st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; break; case 16: st->codec->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR; break;
case 20: st->codec->codec_id = AV_CODEC_ID_PCM_LXF; break; case 20: st->codec->codec_id = AV_CODEC_ID_PCM_LXF; break;
case 24: st->codec->codec_id = AV_CODEC_ID_PCM_S24LE; break; case 24: st->codec->codec_id = AV_CODEC_ID_PCM_S24LE_PLANAR; break;
case 32: st->codec->codec_id = AV_CODEC_ID_PCM_S32LE; break; case 32: st->codec->codec_id = AV_CODEC_ID_PCM_S32LE_PLANAR; break;
default: default:
av_log(s, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,
"only 16-, 20-, 24- and 32-bit PCM currently supported\n"); "only 16-, 20-, 24- and 32-bit PCM currently supported\n");
@@ -286,28 +284,10 @@ static int lxf_read_header(AVFormatContext *s)
return 0; return 0;
} }
/**
* De-planerize the PCM data in lxf->temp
* FIXME: remove this once support for planar audio is added to libavcodec
*
* @param[out] out where to write the de-planerized data to
* @param[in] bytes the total size of the PCM data
*/
static void deplanarize(LXFDemuxContext *lxf, AVStream *ast, uint8_t *out, int bytes)
{
int x, y, z, i, bytes_per_sample = ast->codec->bits_per_coded_sample >> 3;
for (z = i = 0; z < lxf->channels; z++)
for (y = 0; y < bytes / bytes_per_sample / lxf->channels; y++)
for (x = 0; x < bytes_per_sample; x++, i++)
out[x + bytes_per_sample*(z + y*lxf->channels)] = lxf->temp[i];
}
static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt) static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
LXFDemuxContext *lxf = s->priv_data; LXFDemuxContext *lxf = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
uint8_t *buf;
AVStream *ast = NULL; AVStream *ast = NULL;
uint32_t stream; uint32_t stream;
int ret, ret2; int ret, ret2;
@@ -327,30 +307,17 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
//make sure the data fits in the de-planerization buffer
if (ast && ret > LXF_MAX_AUDIO_PACKET) {
av_log(s, AV_LOG_ERROR, "audio packet too large (%i > %i)\n",
ret, LXF_MAX_AUDIO_PACKET);
return AVERROR_INVALIDDATA;
}
if ((ret2 = av_new_packet(pkt, ret)) < 0) if ((ret2 = av_new_packet(pkt, ret)) < 0)
return ret2; return ret2;
//read non-20-bit audio data into lxf->temp so we can deplanarize it if ((ret2 = avio_read(pb, pkt->data, ret)) != ret) {
buf = ast && ast->codec->codec_id != AV_CODEC_ID_PCM_LXF ? lxf->temp : pkt->data;
if ((ret2 = avio_read(pb, buf, ret)) != ret) {
av_free_packet(pkt); av_free_packet(pkt);
return ret2 < 0 ? ret2 : AVERROR_EOF; return ret2 < 0 ? ret2 : AVERROR_EOF;
} }
pkt->stream_index = stream; pkt->stream_index = stream;
if (ast) { if (!ast) {
if(ast->codec->codec_id != AV_CODEC_ID_PCM_LXF)
deplanarize(lxf, ast, pkt->data, ret);
} else {
//picture type (0 = closed I, 1 = open I, 2 = P, 3 = B) //picture type (0 = closed I, 1 = open I, 2 = P, 3 = B)
if (((lxf->video_format >> 22) & 0x3) < 2) if (((lxf->video_format >> 22) & 0x3) < 2)
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;