generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve amr bitrate calculation for VBR files.

Browse Source 
Fixes ticket #3541.
This commit is contained in:
Carl Eugen Hoyos
2014-04-11 23:38:53 +02:00
parent 8b122937af
commit c43222f436
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/amr.c
View File

@@ -30,6 +30,11 @@ Only mono files are supported.
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
typedef struct {
uint64_t cumulated_size;
uint64_t block_count;
} AMRContext;
static const char AMR_header[] = "#!AMR\n"; static const char AMR_header[] = "#!AMR\n";
static const char AMRWB_header[] = "#!AMR-WB\n"; static const char AMRWB_header[] = "#!AMR-WB\n";
@@ -110,6 +115,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
AVCodecContext *enc = s->streams[0]->codec; AVCodecContext *enc = s->streams[0]->codec;
int read, size = 0, toc, mode; int read, size = 0, toc, mode;
int64_t pos = avio_tell(s->pb); int64_t pos = avio_tell(s->pb);
AMRContext *amr = s->priv_data;
if (url_feof(s->pb)) { if (url_feof(s->pb)) {
return AVERROR(EIO); return AVERROR(EIO);
@@ -136,8 +142,11 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
if (!size || av_new_packet(pkt, size)) if (!size || av_new_packet(pkt, size))
return AVERROR(EIO); return AVERROR(EIO);
/* Both AMR formats have 50 frames per second */ if (amr->cumulated_size < UINT64_MAX - size) {
s->streams[0]->codec->bit_rate = size*8*50; amr->cumulated_size += size;
/* Both AMR formats have 50 frames per second */
s->streams[0]->codec->bit_rate = amr->cumulated_size / ++amr->block_count * 8 * 50;
}
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->pos = pos; pkt->pos = pos;
@@ -157,6 +166,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat ff_amr_demuxer = { AVInputFormat ff_amr_demuxer = {
.name = "amr", .name = "amr",
.long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"), .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"),
.priv_data_size = sizeof(AMRContext),
.read_probe = amr_probe, .read_probe = amr_probe,
.read_header = amr_read_header, .read_header = amr_read_header,
.read_packet = amr_read_packet, .read_packet = amr_read_packet,