har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove packet returning in ff_rm_parse_packet() if we're using the packet

Browse Source 
cache, since this can already be accessed through ff_rm_retrieve_cache().
See "[PATCH] rmdec.c: remove cache access duplication" thread.

Originally committed as revision 18009 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2009-03-16 12:57:49 +00:00
parent 748a4312b4
commit c5efef7be9
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/rdt.c
View File

@ -312,14 +312,16 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st,
pos = url_ftell(&pb); pos = url_ftell(&pb);
if (res < 0) if (res < 0)
return res; return res;
rdt->audio_pkt_cnt = res; if (res > 0) {
if (rdt->audio_pkt_cnt > 0 && if (st->codec->codec_id == CODEC_ID_AAC) {
st->codec->codec_id == CODEC_ID_AAC) {
memcpy (rdt->buffer, buf + pos, len - pos); memcpy (rdt->buffer, buf + pos, len - pos);
rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0, rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
}
goto get_cache;
} }
} else { } else {
get_cache:
rdt->audio_pkt_cnt = rdt->audio_pkt_cnt =
ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb, ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb,
st, rdt->rmst[st->index], pkt); st, rdt->rmst[st->index], pkt);

6
libavformat/rm.h
View File

@ -64,9 +64,9 @@ int ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb,
* @param flags pointer to an integer containing the packet flags, may be * @param flags pointer to an integer containing the packet flags, may be
updated updated
* @param ts pointer to timestamp, may be updated * @param ts pointer to timestamp, may be updated
* @return >=0 on success (where >0 indicates there are cached samples that * @return <0 on error, 0 if a packet was placed in the \p pkt pointer. A
* can be retrieved with subsequent calls to ff_rm_retrieve_cache()), * value >0 means that no data was placed in \p pkt, but that cached
* errno codes on error * data is available by calling ff_rm_retrieve_cache().
*/ */
int ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, int ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
AVStream *st, RMStream *rst, int len, AVStream *st, RMStream *rst, int len,

18
libavformat/rmdec.c
View File

@ -627,16 +627,9 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
if (++(ast->sub_packet_cnt) < h) if (++(ast->sub_packet_cnt) < h)
return -1; return -1;
else {
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 - 1; rm->audio_pkt_cnt = h * w / st->codec->block_align;
// Release first audio packet
av_new_packet(pkt, st->codec->block_align);
memcpy(pkt->data, ast->pkt.data, st->codec->block_align); //FIXME avoid this
*timestamp = ast->audiotimestamp;
*flags = 2; // Mark first packet as keyframe
}
} else if (st->codec->codec_id == CODEC_ID_AAC) { } else if (st->codec->codec_id == CODEC_ID_AAC) {
int x; int x;
rm->audio_stream_num = st->index; rm->audio_stream_num = st->index;
@ -644,11 +637,10 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
if (ast->sub_packet_cnt) { if (ast->sub_packet_cnt) {
for (x = 0; x < ast->sub_packet_cnt; x++) for (x = 0; x < ast->sub_packet_cnt; x++)
ast->sub_packet_lengths[x] = get_be16(pb); ast->sub_packet_lengths[x] = get_be16(pb);
// Release first audio packet rm->audio_pkt_cnt = ast->sub_packet_cnt;
rm->audio_pkt_cnt = ast->sub_packet_cnt - 1; ast->audiotimestamp = *timestamp;
av_get_packet(pb, pkt, ast->sub_packet_lengths[0]); } else
*flags = 2; // Mark first packet as keyframe return -1;
}
} else { } else {
av_get_packet(pb, pkt, len); av_get_packet(pb, pkt, len);
rm_ac3_swap_bytes(st, pkt); rm_ac3_swap_bytes(st, pkt);