virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

flvenc: use AVFormatContext, not AVCodecContext for logging.

Browse Source 
Encoder tag being used for muxer messages is confusing.
This commit is contained in:
Anton Khirnov 2012-05-07 16:09:30 +02:00
parent 455245ca8a
commit 0a3ad7ff80
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/flvenc.c
View File

@ -64,18 +64,19 @@ typedef struct FLVStreamContext {
int64_t last_ts; ///< last timestamp for each stream int64_t last_ts; ///< last timestamp for each stream
} FLVStreamContext; } FLVStreamContext;
static int get_audio_flags(AVCodecContext *enc){ static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc)
{
int flags = (enc->bits_per_coded_sample == 16) ? FLV_SAMPLESSIZE_16BIT : FLV_SAMPLESSIZE_8BIT; int flags = (enc->bits_per_coded_sample == 16) ? FLV_SAMPLESSIZE_16BIT : FLV_SAMPLESSIZE_8BIT;
if (enc->codec_id == CODEC_ID_AAC) // specs force these parameters if (enc->codec_id == CODEC_ID_AAC) // specs force these parameters
return FLV_CODECID_AAC | FLV_SAMPLERATE_44100HZ | FLV_SAMPLESSIZE_16BIT | FLV_STEREO; return FLV_CODECID_AAC | FLV_SAMPLERATE_44100HZ | FLV_SAMPLESSIZE_16BIT | FLV_STEREO;
else if (enc->codec_id == CODEC_ID_SPEEX) { else if (enc->codec_id == CODEC_ID_SPEEX) {
if (enc->sample_rate != 16000) { if (enc->sample_rate != 16000) {
av_log(enc, AV_LOG_ERROR, "flv only supports wideband (16kHz) Speex audio\n"); av_log(s, AV_LOG_ERROR, "flv only supports wideband (16kHz) Speex audio\n");
return -1; return -1;
} }
if (enc->channels != 1) { if (enc->channels != 1) {
av_log(enc, AV_LOG_ERROR, "flv only supports mono Speex audio\n"); av_log(s, AV_LOG_ERROR, "flv only supports mono Speex audio\n");
return -1; return -1;
} }
return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT; return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT;
@ -98,7 +99,7 @@ static int get_audio_flags(AVCodecContext *enc){
break; break;
} }
default: default:
av_log(enc, AV_LOG_ERROR, "flv does not support that sample rate, choose from (44100, 22050, 11025).\n"); av_log(s, AV_LOG_ERROR, "flv does not support that sample rate, choose from (44100, 22050, 11025).\n");
return -1; return -1;
} }
} }
@ -136,7 +137,7 @@ static int get_audio_flags(AVCodecContext *enc){
flags |= enc->codec_tag<<4; flags |= enc->codec_tag<<4;
break; break;
default: default:
av_log(enc, AV_LOG_ERROR, "codec not compatible with flv\n"); av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n");
return -1; return -1;
} }
@ -194,12 +195,12 @@ static int flv_write_header(AVFormatContext *s)
} }
video_enc = enc; video_enc = enc;
if(enc->codec_tag == 0) { if(enc->codec_tag == 0) {
av_log(enc, AV_LOG_ERROR, "video codec not compatible with flv\n"); av_log(s, AV_LOG_ERROR, "video codec not compatible with flv\n");
return -1; return -1;
} }
} else { } else {
audio_enc = enc; audio_enc = enc;
if(get_audio_flags(enc)<0) if (get_audio_flags(s, enc) < 0)
return -1; return -1;
} }
avpriv_set_pts_info(s->streams[i], 32, 1, 1000); /* 32 bit pts in ms */ avpriv_set_pts_info(s->streams[i], 32, 1, 1000); /* 32 bit pts in ms */
@ -324,7 +325,7 @@ static int flv_write_header(AVFormatContext *s)
avio_wb24(pb, 0); // streamid avio_wb24(pb, 0); // streamid
pos = avio_tell(pb); pos = avio_tell(pb);
if (enc->codec_id == CODEC_ID_AAC) { if (enc->codec_id == CODEC_ID_AAC) {
avio_w8(pb, get_audio_flags(enc)); avio_w8(pb, get_audio_flags(s, enc));
avio_w8(pb, 0); // AAC sequence header avio_w8(pb, 0); // AAC sequence header
avio_write(pb, enc->extradata, enc->extradata_size); avio_write(pb, enc->extradata, enc->extradata_size);
} else { } else {
@ -400,14 +401,14 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
flags = enc->codec_tag; flags = enc->codec_tag;
if(flags == 0) { if(flags == 0) {
av_log(enc, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id); av_log(s, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id);
return -1; return -1;
} }
flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER; flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER;
} else { } else {
assert(enc->codec_type == AVMEDIA_TYPE_AUDIO); assert(enc->codec_type == AVMEDIA_TYPE_AUDIO);
flags = get_audio_flags(enc); flags = get_audio_flags(s, enc);
assert(size); assert(size);