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

nutenc: K&R formatting cosmetics

Browse Source
This commit is contained in:
Luca Barbato
2012-10-27 00:41:02 +02:00
parent 4cbae57cef
commit fce4450dec
1 changed files with 409 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

259
libavformat/nutenc.c
View File

@@ -28,7 +28,9 @@
#include "internal.h"
#include "avio_internal.h"
static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
static int find_expected_header(AVCodecContext *c, int size, int key_frame,
uint8_t out[64])
{
int sample_rate = c->sample_rate;
if (size > 4096)
@@ -43,11 +45,13 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint
out[3] = 0xB6;
return 4;
}
}else if(c->codec_id == AV_CODEC_ID_MPEG1VIDEO || c->codec_id == AV_CODEC_ID_MPEG2VIDEO){
} else if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO ||
c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
return 3;
} else if (c->codec_id == AV_CODEC_ID_H264) {
return 3;
}else if(c->codec_id == AV_CODEC_ID_MP3 || c->codec_id == AV_CODEC_ID_MP2){
} else if (c->codec_id == AV_CODEC_ID_MP3 ||
c->codec_id == AV_CODEC_ID_MP2) {
int lsf, mpeg25, sample_rate_index, bitrate_index, frame_size;
int layer = c->codec_id == AV_CODEC_ID_MP3 ? 3 : 2;
unsigned int header = 0xFFF00000;
@@ -55,15 +59,20 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint
lsf = sample_rate < (24000 + 32000) / 2;
mpeg25 = sample_rate < (12000 + 16000) / 2;
sample_rate <<= lsf + mpeg25;
if (sample_rate < (32000 + 44100)/2) sample_rate_index=2;
else if(sample_rate < (44100 + 48000)/2) sample_rate_index=0;
else sample_rate_index=1;
if (sample_rate < (32000 + 44100) / 2)
sample_rate_index = 2;
else if (sample_rate < (44100 + 48000) / 2)
sample_rate_index = 0;
else
sample_rate_index = 1;
sample_rate = avpriv_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25);
for (bitrate_index = 2; bitrate_index < 30; bitrate_index++) {
frame_size = avpriv_mpa_bitrate_tab[lsf][layer-1][bitrate_index>>1];
frame_size = (frame_size * 144000) / (sample_rate << lsf) + (bitrate_index&1);
frame_size =
avpriv_mpa_bitrate_tab[lsf][layer - 1][bitrate_index >> 1];
frame_size = (frame_size * 144000) / (sample_rate << lsf) +
(bitrate_index & 1);
if (frame_size == size)
break;
@@ -89,22 +98,25 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint
return 0;
}
static int find_header_idx(AVFormatContext *s, AVCodecContext *c, int size, int frame_type){
static int find_header_idx(AVFormatContext *s, AVCodecContext *c, int size,
int frame_type)
{
NUTContext *nut = s->priv_data;
uint8_t out[64];
int i;
int len = find_expected_header(c, size, frame_type, out);
for (i = 1; i < nut->header_count; i++) {
if( len == nut->header_len[i]
&& !memcmp(out, nut->header[i], len)){
if (len == nut->header_len[i] && !memcmp(out, nut->header[i], len)) {
return i;
}
}
return 0;
}
static void build_elision_headers(AVFormatContext *s){
static void build_elision_headers(AVFormatContext *s)
{
NUTContext *nut = s->priv_data;
int i;
//FIXME this is lame
@@ -125,7 +137,8 @@ static void build_elision_headers(AVFormatContext *s){
}
}
static void build_frame_code(AVFormatContext *s){
static void build_frame_code(AVFormatContext *s)
{
NUTContext *nut = s->priv_data;
int key_frame, index, pred, stream_id;
int start = 1;
@@ -157,10 +170,7 @@ static void build_frame_code(AVFormatContext *s){
int pred_count;
for (key_frame = 0; key_frame < 2; key_frame++) {
if(intra_only && keyframe_0_esc && key_frame==0)
continue;
{
if (!intra_only || !keyframe_0_esc || key_frame != 0) {
FrameCode *ft = &nut->frame_code[start2];
ft->flags = FLAG_KEY * key_frame;
ft->flags |= FLAG_SIZE_MSB | FLAG_CODED_PTS;
@@ -174,9 +184,10 @@ static void build_frame_code(AVFormatContext *s){
key_frame = intra_only;
if (is_audio) {
int frame_bytes= codec->frame_size*(int64_t)codec->bit_rate / (8*codec->sample_rate);
int frame_bytes = codec->frame_size * (int64_t)codec->bit_rate /
(8 * codec->sample_rate);
int pts;
for(pts=0; pts<2; pts++){
for (pts = 0; pts < 2; pts++)
for (pred = 0; pred < 2; pred++) {
FrameCode *ft = &nut->frame_code[start2];
ft->flags = FLAG_KEY * key_frame;
@@ -187,7 +198,6 @@ static void build_frame_code(AVFormatContext *s){
ft->header_idx = find_header_idx(s, codec, frame_bytes + pred, key_frame);
start2++;
}
}
} else {
FrameCode *ft = &nut->frame_code[start2];
ft->flags = FLAG_KEY | FLAG_SIZE_MSB;
@@ -232,29 +242,33 @@ static void build_frame_code(AVFormatContext *s){
}
}
}
memmove(&nut->frame_code['N'+1], &nut->frame_code['N'], sizeof(FrameCode)*(255-'N'));
memmove(&nut->frame_code['N' + 1], &nut->frame_code['N'],
sizeof(FrameCode) * (255 - 'N'));
nut->frame_code[0].flags =
nut->frame_code[255].flags =
nut->frame_code['N'].flags = FLAG_INVALID;
}
static void put_tt(NUTContext *nut, AVRational *time_base, AVIOContext *bc, uint64_t val){
static void put_tt(NUTContext *nut, AVRational *time_base, AVIOContext *bc,
uint64_t val)
{
val *= nut->time_base_count;
val += time_base - nut->time_base;
ff_put_v(bc, val);
}
/**
* Store a string as vb.
*/
static void put_str(AVIOContext *bc, const char *string){
static void put_str(AVIOContext *bc, const char *string)
{
int len = strlen(string);
ff_put_v(bc, len);
avio_write(bc, string, len);
}
static void put_s(AVIOContext *bc, int64_t val){
static void put_s(AVIOContext *bc, int64_t val)
{
ff_put_v(bc, 2 * FFABS(val) - (val > 0));
}
@@ -279,7 +293,9 @@ static inline void put_s_trace(AVIOContext *bc, int64_t v, const char *file,
#endif
//FIXME remove calculate_checksum
static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, int calculate_checksum, uint64_t startcode){
static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc,
int calculate_checksum, uint64_t startcode)
{
uint8_t *dyn_buf = NULL;
int dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
int forw_ptr = dyn_size + 4 * calculate_checksum;
@@ -300,8 +316,10 @@ static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, in
av_free(dyn_buf);
}
static void write_mainheader(NUTContext *nut, AVIOContext *bc){
int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields, tmp_head_idx;
static void write_mainheader(NUTContext *nut, AVIOContext *bc)
{
int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields,
tmp_head_idx;
int64_t tmp_match;
ff_put_v(bc, 3); /* version */
@@ -323,12 +341,17 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc){
tmp_fields = 0;
tmp_size = 0;
// tmp_res=0;
if(tmp_pts != nut->frame_code[i].pts_delta) tmp_fields=1;
if(tmp_mul != nut->frame_code[i].size_mul ) tmp_fields=2;
if(tmp_stream != nut->frame_code[i].stream_id) tmp_fields=3;
if(tmp_size != nut->frame_code[i].size_lsb ) tmp_fields=4;
if (tmp_pts != nut->frame_code[i].pts_delta)
tmp_fields = 1;
if (tmp_mul != nut->frame_code[i].size_mul)
tmp_fields = 2;
if (tmp_stream != nut->frame_code[i].stream_id)
tmp_fields = 3;
if (tmp_size != nut->frame_code[i].size_lsb)
tmp_fields = 4;
// if(tmp_res != nut->frame_code[i].res ) tmp_fields=5;
if(tmp_head_idx!=nut->frame_code[i].header_idx)tmp_fields=8;
if (tmp_head_idx != nut->frame_code[i].header_idx)
tmp_fields = 8;
tmp_pts = nut->frame_code[i].pts_delta;
tmp_flags = nut->frame_code[i].flags;
@@ -343,26 +366,36 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc){
j--;
continue;
}
if(nut->frame_code[i].pts_delta != tmp_pts ) break;
if(nut->frame_code[i].flags != tmp_flags ) break;
if(nut->frame_code[i].stream_id != tmp_stream) break;
if(nut->frame_code[i].size_mul != tmp_mul ) break;
if(nut->frame_code[i].size_lsb != tmp_size+j) break;
// if(nut->frame_code[i].res != tmp_res ) break;
if(nut->frame_code[i].header_idx!= tmp_head_idx) break;
if (nut->frame_code[i].pts_delta != tmp_pts ||
nut->frame_code[i].flags != tmp_flags ||
nut->frame_code[i].stream_id != tmp_stream ||
nut->frame_code[i].size_mul != tmp_mul ||
nut->frame_code[i].size_lsb != tmp_size + j ||
// nut->frame_code[i].res != tmp_res ||
nut->frame_code[i].header_idx != tmp_head_idx)
break;
}
if(j != tmp_mul - tmp_size) tmp_fields=6;
if (j != tmp_mul - tmp_size)
tmp_fields = 6;
ff_put_v(bc, tmp_flags);
ff_put_v(bc, tmp_fields);
if(tmp_fields>0) put_s(bc, tmp_pts);
if(tmp_fields>1) ff_put_v(bc, tmp_mul);
if(tmp_fields>2) ff_put_v(bc, tmp_stream);
if(tmp_fields>3) ff_put_v(bc, tmp_size);
if(tmp_fields>4) ff_put_v(bc, 0 /*tmp_res*/);
if(tmp_fields>5) ff_put_v(bc, j);
if(tmp_fields>6) ff_put_v(bc, tmp_match);
if(tmp_fields>7) ff_put_v(bc, tmp_head_idx);
if (tmp_fields > 0)
put_s(bc, tmp_pts);
if (tmp_fields > 1)
ff_put_v(bc, tmp_mul);
if (tmp_fields > 2)
ff_put_v(bc, tmp_stream);
if (tmp_fields > 3)
ff_put_v(bc, tmp_size);
if (tmp_fields > 4)
ff_put_v(bc, 0 /*tmp_res*/);
if (tmp_fields > 5)
ff_put_v(bc, j);
if (tmp_fields > 6)
ff_put_v(bc, tmp_match);
if (tmp_fields > 7)
ff_put_v(bc, tmp_head_idx);
}
ff_put_v(bc, nut->header_count - 1);
for (i = 1; i < nut->header_count; i++) {
@@ -371,17 +404,27 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc){
}
}
static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream *st, int i){
static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc,
AVStream *st, int i)
{
NUTContext *nut = avctx->priv_data;
AVCodecContext *codec = st->codec;
unsigned codec_tag = av_codec_get_tag(ff_nut_codec_tags, codec->codec_id);
ff_put_v(bc, i);
switch (codec->codec_type) {
case AVMEDIA_TYPE_VIDEO: ff_put_v(bc, 0); break;
case AVMEDIA_TYPE_AUDIO: ff_put_v(bc, 1); break;
case AVMEDIA_TYPE_SUBTITLE: ff_put_v(bc, 2); break;
default : ff_put_v(bc, 3); break;
case AVMEDIA_TYPE_VIDEO:
ff_put_v(bc, 0);
break;
case AVMEDIA_TYPE_AUDIO:
ff_put_v(bc, 1);
break;
case AVMEDIA_TYPE_SUBTITLE:
ff_put_v(bc, 2);
break;
default:
ff_put_v(bc, 3);
break;
}
ff_put_v(bc, 4);
@@ -414,7 +457,8 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream
ff_put_v(bc, codec->width);
ff_put_v(bc, codec->height);
if(st->sample_aspect_ratio.num<=0 || st->sample_aspect_ratio.den<=0){
if (st->sample_aspect_ratio.num <= 0 ||
st->sample_aspect_ratio.den <= 0) {
ff_put_v(bc, 0);
ff_put_v(bc, 0);
} else {
@@ -429,14 +473,16 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream
return 0;
}
static int add_info(AVIOContext *bc, const char *type, const char *value){
static int add_info(AVIOContext *bc, const char *type, const char *value)
{
put_str(bc, type);
put_s(bc, -1);
put_str(bc, value);
return 1;
}
static int write_globalinfo(NUTContext *nut, AVIOContext *bc){
static int write_globalinfo(NUTContext *nut, AVIOContext *bc)
{
AVFormatContext *s = nut->avf;
AVDictionaryEntry *t = NULL;
AVIOContext *dyn_bc;
@@ -521,7 +567,8 @@ static int write_chapter(NUTContext *nut, AVIOContext *bc, int id)
return 0;
}
static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
static int write_headers(AVFormatContext *avctx, AVIOContext *bc)
{
NUTContext *nut = avctx->priv_data;
AVIOContext *dyn_bc;
int i, ret;
@@ -538,7 +585,8 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
ret = avio_open_dyn_buf(&dyn_bc);
if (ret < 0)
return ret;
if ((ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i)) < 0)
ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i);
if (ret < 0)
return ret;
put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE);
}
@@ -584,7 +632,8 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
return 0;
}
static int nut_write_header(AVFormatContext *s){
static int nut_write_header(AVFormatContext *s)
{
NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb;
int i, j, ret;
@@ -607,15 +656,15 @@ static int nut_write_header(AVFormatContext *s){
AVStream *st = s->streams[i];
int ssize;
AVRational time_base;
ff_parse_specific_params(st->codec, &time_base.den, &ssize, &time_base.num);
ff_parse_specific_params(st->codec, &time_base.den, &ssize,
&time_base.num);
avpriv_set_pts_info(st, 64, time_base.num, time_base.den);
for(j=0; j<nut->time_base_count; j++){
for (j = 0; j < nut->time_base_count; j++)
if (!memcmp(&time_base, &nut->time_base[j], sizeof(AVRational))) {
break;
}
}
nut->time_base[j] = time_base;
nut->stream[i].time_base = &nut->time_base[j];
if (j == nut->time_base_count)
@@ -625,16 +674,16 @@ static int nut_write_header(AVFormatContext *s){
nut->stream[i].msb_pts_shift = 7;
else
nut->stream[i].msb_pts_shift = 14;
nut->stream[i].max_pts_distance= FFMAX(time_base.den, time_base.num) / time_base.num;
nut->stream[i].max_pts_distance =
FFMAX(time_base.den, time_base.num) / time_base.num;
}
for (i = 0; i < s->nb_chapters; i++) {
AVChapter *ch = s->chapters[i];
for (j = 0; j < nut->time_base_count; j++) {
for (j = 0; j < nut->time_base_count; j++)
if (!memcmp(&ch->time_base, &nut->time_base[j], sizeof(AVRational)))
break;
}
nut->time_base[j] = ch->time_base;
nut->chapter[i].time_base = &nut->time_base[j];
@@ -660,25 +709,34 @@ static int nut_write_header(AVFormatContext *s){
return 0;
}
static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc, AVPacket *pkt){
static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc,
AVPacket *pkt)
{
int flags = 0;
if(pkt->flags & AV_PKT_FLAG_KEY ) flags |= FLAG_KEY;
if(pkt->stream_index != fc->stream_id ) flags |= FLAG_STREAM_ID;
if(pkt->size / fc->size_mul ) flags |= FLAG_SIZE_MSB;
if(pkt->pts - nus->last_pts != fc->pts_delta) flags |= FLAG_CODED_PTS;
if(pkt->size > 2*nut->max_distance ) flags |= FLAG_CHECKSUM;
if(FFABS(pkt->pts - nus->last_pts)
> nus->max_pts_distance) flags |= FLAG_CHECKSUM;
if( pkt->size < nut->header_len[fc->header_idx]
|| (pkt->size > 4096 && fc->header_idx)
|| memcmp(pkt->data, nut->header[fc->header_idx], nut->header_len[fc->header_idx]))
if (pkt->flags & AV_PKT_FLAG_KEY)
flags |= FLAG_KEY;
if (pkt->stream_index != fc->stream_id)
flags |= FLAG_STREAM_ID;
if (pkt->size / fc->size_mul)
flags |= FLAG_SIZE_MSB;
if (pkt->pts - nus->last_pts != fc->pts_delta)
flags |= FLAG_CODED_PTS;
if (pkt->size > 2 * nut->max_distance)
flags |= FLAG_CHECKSUM;
if (FFABS(pkt->pts - nus->last_pts) > nus->max_pts_distance)
flags |= FLAG_CHECKSUM;
if (pkt->size < nut->header_len[fc->header_idx] ||
(pkt->size > 4096 && fc->header_idx) ||
memcmp(pkt->data, nut->header[fc->header_idx],
nut->header_len[fc->header_idx]))
flags |= FLAG_HEADER_IDX;
return flags | (fc->flags & FLAG_CODED);
}
static int find_best_header_idx(NUTContext *nut, AVPacket *pkt){
static int find_best_header_idx(NUTContext *nut, AVPacket *pkt)
{
int i;
int best_i = 0;
int best_len = 0;
@@ -686,24 +744,25 @@ static int find_best_header_idx(NUTContext *nut, AVPacket *pkt){
if (pkt->size > 4096)
return 0;
for(i=1; i<nut->header_count; i++){
for (i = 1; i < nut->header_count; i++)
if (pkt->size >= nut->header_len[i]
&& nut->header_len[i] > best_len
&& !memcmp(pkt->data, nut->header[i], nut->header_len[i])) {
best_i = i;
best_len = nut->header_len[i];
}
}
return best_i;
}
static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
{
NUTContext *nut = s->priv_data;
StreamContext *nus = &nut->stream[pkt->stream_index];
AVIOContext *bc = s->pb, *dyn_bc;
FrameCode *fc;
int64_t coded_pts;
int best_length, frame_code, flags, needed_flags, i, header_idx, best_header_idx;
int best_length, frame_code, flags, needed_flags, i, header_idx,
best_header_idx;
int key_frame = !!(pkt->flags & AV_PKT_FLAG_KEY);
int store_sp = 0;
int ret;
@@ -717,7 +776,8 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
if (key_frame && !(nus->last_flags & FLAG_KEY))
store_sp = 1;
if(pkt->size + 30/*FIXME check*/ + avio_tell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
if (pkt->size + 30 /*FIXME check*/ + avio_tell(bc) >=
nut->last_syncpoint_pos + nut->max_distance)
store_sp = 1;
//FIXME: Ensure store_sp is 1 in the first place.
@@ -732,8 +792,10 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
nus->time_base->num * (int64_t)nut->stream[i].time_base->den,
nus->time_base->den * (int64_t)nut->stream[i].time_base->num,
AV_ROUND_DOWN);
int index= av_index_search_timestamp(st, dts_tb, AVSEEK_FLAG_BACKWARD);
if(index>=0) dummy.pos= FFMIN(dummy.pos, st->index_entries[index].pos);
int index = av_index_search_timestamp(st, dts_tb,
AVSEEK_FLAG_BACKWARD);
if (index >= 0)
dummy.pos = FFMIN(dummy.pos, st->index_entries[index].pos);
}
if (dummy.pos == INT64_MAX)
dummy.pos = 0;
@@ -795,7 +857,8 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
length += ff_get_v_length(coded_pts);
if ((flags & FLAG_CODED)
&& nut->header_len[best_header_idx] > nut->header_len[fc->header_idx]+1){
&& nut->header_len[best_header_idx] >
nut->header_len[fc->header_idx] + 1) {
flags |= FLAG_HEADER_IDX;
}
@@ -826,15 +889,22 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
ff_put_v(bc, (flags ^ needed_flags) & ~(FLAG_CODED));
flags = needed_flags;
}
if(flags & FLAG_STREAM_ID) ff_put_v(bc, pkt->stream_index);
if(flags & FLAG_CODED_PTS) ff_put_v(bc, coded_pts);
if(flags & FLAG_SIZE_MSB) ff_put_v(bc, pkt->size / fc->size_mul);
if(flags & FLAG_HEADER_IDX) ff_put_v(bc, header_idx= best_header_idx);
if (flags & FLAG_STREAM_ID)
ff_put_v(bc, pkt->stream_index);
if (flags & FLAG_CODED_PTS)
ff_put_v(bc, coded_pts);
if (flags & FLAG_SIZE_MSB)
ff_put_v(bc, pkt->size / fc->size_mul);
if (flags & FLAG_HEADER_IDX)
ff_put_v(bc, header_idx = best_header_idx);
if(flags & FLAG_CHECKSUM) avio_wl32(bc, ffio_get_checksum(bc));
else ffio_get_checksum(bc);
if (flags & FLAG_CHECKSUM)
avio_wl32(bc, ffio_get_checksum(bc));
else
ffio_get_checksum(bc);
avio_write(bc, pkt->data + nut->header_len[header_idx], pkt->size - nut->header_len[header_idx]);
avio_write(bc, pkt->data + nut->header_len[header_idx],
pkt->size - nut->header_len[header_idx]);
nus->last_flags = flags;
nus->last_pts = pkt->pts;
@@ -851,7 +921,8 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
return 0;
}
static int nut_write_trailer(AVFormatContext *s){
static int nut_write_trailer(AVFormatContext *s)
{
NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb;