Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Merge remote-tracking branch 'qatar/master'

Browse source 
* qatar/master:
  Use deinterleavers for demangling audio packets in RealMedia.
  vf_scale: don't leak SWS context.
  doxygen: drop another pointless star from pointer variable name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-08-28 00:14:40 +02:00
commit 3dd44e5075
2 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
libavformat/rmdec.c
View file

@ -26,6 +26,13 @@
#include "riff.h" #include "riff.h"
#include "rm.h" #include "rm.h"
#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/Atrac
#define DEINT_ID_INT0 MKTAG('I', 'n', 't', '0') ///< no interleaving needed
#define DEINT_ID_INT4 MKTAG('I', 'n', 't', '4') ///< interleaving for 28.8
#define DEINT_ID_SIPR MKTAG('s', 'i', 'p', 'r') ///< interleaving for Sipro
#define DEINT_ID_VBRF MKTAG('v', 'b', 'r', 'f') ///< VBR case for AAC
#define DEINT_ID_VBRS MKTAG('v', 'b', 'r', 's') ///< VBR case for AAC
struct RMStream { struct RMStream {
AVPacket pkt; ///< place to store merged video frame / reordered audio data AVPacket pkt; ///< place to store merged video frame / reordered audio data
int videobufsize; ///< current assembled frame size int videobufsize; ///< current assembled frame size
@ -39,6 +46,7 @@ struct RMStream {
int sub_packet_size, sub_packet_h, coded_framesize; ///< Descrambling parameters from container int sub_packet_size, sub_packet_h, coded_framesize; ///< Descrambling parameters from container
int audio_framesize; /// Audio frame size from container int audio_framesize; /// Audio frame size from container
int sub_packet_lengths[16]; /// Length of each subpacket int sub_packet_lengths[16]; /// Length of each subpacket
int32_t deint_id; ///< deinterleaver used in audio stream
}; };
typedef struct { typedef struct {
@ -147,6 +155,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb,
st->codec->channels = 1; st->codec->channels = 1;
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_RA_144; st->codec->codec_id = CODEC_ID_RA_144;
ast->deint_id = DEINT_ID_INT0;
} else { } else {
int flavor, sub_packet_h, coded_framesize, sub_packet_size; int flavor, sub_packet_h, coded_framesize, sub_packet_size;
int codecdata_length; int codecdata_length;
@ -172,17 +181,31 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb,
avio_rb32(pb); avio_rb32(pb);
st->codec->channels = avio_rb16(pb); st->codec->channels = avio_rb16(pb);
if (version == 5) { if (version == 5) {
avio_rb32(pb); ast->deint_id = avio_rl32(pb);
avio_read(pb, buf, 4); avio_read(pb, buf, 4);
buf[4] = 0; buf[4] = 0;
} else { } else {
get_str8(pb, buf, sizeof(buf)); /* desc */ get_str8(pb, buf, sizeof(buf)); /* desc */
ast->deint_id = AV_RL32(buf);
get_str8(pb, buf, sizeof(buf)); /* desc */ get_str8(pb, buf, sizeof(buf)); /* desc */
} }
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_tag = AV_RL32(buf); st->codec->codec_tag = AV_RL32(buf);
st->codec->codec_id = ff_codec_get_id(ff_rm_codec_tags, st->codec->codec_id = ff_codec_get_id(ff_rm_codec_tags,
st->codec->codec_tag); st->codec->codec_tag);
switch (ast->deint_id) {
case DEINT_ID_GENR:
case DEINT_ID_INT0:
case DEINT_ID_INT4:
case DEINT_ID_SIPR:
case DEINT_ID_VBRS:
case DEINT_ID_VBRF:
break;
default:
av_log(NULL,0,"Unknown interleaver %X\n", ast->deint_id);
return AVERROR_INVALIDDATA;
}
switch (st->codec->codec_id) { switch (st->codec->codec_id) {
case CODEC_ID_AC3: case CODEC_ID_AC3:
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
@ -706,10 +729,9 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len, seq, &timestamp)) if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len, seq, &timestamp))
return -1; //got partial frame return -1; //got partial frame
} else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
if ((st->codec->codec_id == CODEC_ID_RA_288) || if ((ast->deint_id == DEINT_ID_GENR) ||
(st->codec->codec_id == CODEC_ID_COOK) || (ast->deint_id == DEINT_ID_INT4) ||
(st->codec->codec_id == CODEC_ID_ATRAC3) || (ast->deint_id == DEINT_ID_SIPR)) {
(st->codec->codec_id == CODEC_ID_SIPR)) {
int x; int x;
int sps = ast->sub_packet_size; int sps = ast->sub_packet_size;
int cfs = ast->coded_framesize; int cfs = ast->coded_framesize;
@ -722,30 +744,30 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
if (!y) if (!y)
ast->audiotimestamp = timestamp; ast->audiotimestamp = timestamp;
switch(st->codec->codec_id) { switch (ast->deint_id) {
case CODEC_ID_RA_288: case DEINT_ID_INT4:
for (x = 0; x < h/2; x++) for (x = 0; x < h/2; x++)
avio_read(pb, ast->pkt.data+x*2*w+y*cfs, cfs); avio_read(pb, ast->pkt.data+x*2*w+y*cfs, cfs);
break; break;
case CODEC_ID_ATRAC3: case DEINT_ID_GENR:
case CODEC_ID_COOK:
for (x = 0; x < w/sps; x++) for (x = 0; x < w/sps; x++)
avio_read(pb, ast->pkt.data+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps); avio_read(pb, ast->pkt.data+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);
break; break;
case CODEC_ID_SIPR: case DEINT_ID_SIPR:
avio_read(pb, ast->pkt.data + y * w, w); avio_read(pb, ast->pkt.data + y * w, w);
break; break;
} }
if (++(ast->sub_packet_cnt) < h) if (++(ast->sub_packet_cnt) < h)
return -1; return -1;
if (st->codec->codec_id == CODEC_ID_SIPR) if (ast->deint_id == DEINT_ID_SIPR)
ff_rm_reorder_sipr_data(ast->pkt.data, h, w); ff_rm_reorder_sipr_data(ast->pkt.data, h, w);
ast->sub_packet_cnt = 0; ast->sub_packet_cnt = 0;
rm->audio_stream_num = st->index; rm->audio_stream_num = st->index;
rm->audio_pkt_cnt = h * w / st->codec->block_align; rm->audio_pkt_cnt = h * w / st->codec->block_align;
} else if (st->codec->codec_id == CODEC_ID_AAC) { } else if ((ast->deint_id == DEINT_ID_VBRF) ||
(ast->deint_id == DEINT_ID_VBRS)) {
int x; int x;
rm->audio_stream_num = st->index; rm->audio_stream_num = st->index;
ast->sub_packet_cnt = (avio_rb16(pb) & 0xf0) >> 4; ast->sub_packet_cnt = (avio_rb16(pb) & 0xf0) >> 4;

2
libavutil/fifo.h
View file

@ -111,7 +111,7 @@ void av_fifo_drain(AVFifoBuffer *f, int size);
* Return a pointer to the data stored in a FIFO buffer at a certain offset. * Return a pointer to the data stored in a FIFO buffer at a certain offset.
* The FIFO buffer is not modified. * The FIFO buffer is not modified.
* *
* @param *f AVFifoBuffer to peek at, f must be non-NULL * @param f AVFifoBuffer to peek at, f must be non-NULL
* @param offs an offset in bytes, its absolute value must be less * @param offs an offset in bytes, its absolute value must be less
* than the used buffer size or the returned pointer will * than the used buffer size or the returned pointer will
* point outside to the buffer data. * point outside to the buffer data.