X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=f74ae775fe3cd130adc8a1c9817c7590ea545b72;hb=4b85a28f2766dd2896d311675e26ae0350b296ed;hp=07249846781ca405152afb690afb9c24204c7cc7;hpb=0c9bbaec6021ff2ab6017e8b99354a26c2394b47;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index 07249846781..f74ae775fe3 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -34,6 +34,7 @@ #include #include #endif +#undef time //needed because HAVE_AV_CONFIG_H is defined on top #include #include "cmdutils.h" @@ -71,6 +72,11 @@ static int frame_width = 160; static int frame_height = 128; static float frame_aspect_ratio = 0; static enum PixelFormat frame_pix_fmt = PIX_FMT_YUV420P; +static int frame_padtop = 0; +static int frame_padbottom = 0; +static int frame_padleft = 0; +static int frame_padright = 0; +static int padcolor[3] = {16,128,128}; /* default to black */ static int frame_topBand = 0; static int frame_bottomBand = 0; static int frame_leftBand = 0; @@ -82,6 +88,8 @@ static int video_bit_rate_tolerance = 4000*1000; static float video_qscale = 0; static int video_qmin = 2; static int video_qmax = 31; +static int video_lmin = 2*FF_QP2LAMBDA; +static int video_lmax = 31*FF_QP2LAMBDA; static int video_mb_qmin = 2; static int video_mb_qmax = 31; static int video_qdiff = 3; @@ -105,22 +113,41 @@ static float video_b_qfactor = 1.25; static float video_b_qoffset = 1.25; static float video_i_qfactor = -0.8; static float video_i_qoffset = 0.0; +static int video_intra_quant_bias= FF_DEFAULT_QUANT_BIAS; +static int video_inter_quant_bias= FF_DEFAULT_QUANT_BIAS; static int me_method = ME_EPZS; static int video_disable = 0; static int video_codec_id = CODEC_ID_NONE; static int same_quality = 0; static int b_frames = 0; static int mb_decision = FF_MB_DECISION_SIMPLE; +static int ildct_cmp = FF_CMP_VSAD; static int mb_cmp = FF_CMP_SAD; static int sub_cmp = FF_CMP_SAD; static int cmp = FF_CMP_SAD; +static int pre_cmp = FF_CMP_SAD; +static int pre_me = 0; +static float lumi_mask = 0; +static float dark_mask = 0; +static float scplx_mask = 0; +static float tcplx_mask = 0; +static float p_mask = 0; static int use_4mv = 0; static int use_obmc = 0; +static int use_loop = 0; static int use_aic = 0; static int use_aiv = 0; static int use_umv = 0; +static int use_ss = 0; +static int use_alt_scan = 0; +static int use_trell = 0; +static int use_scan_offset = 0; +static int use_qpel = 0; +static int qns = 0; +static int closed_gop = 0; static int do_deinterlace = 0; -static int do_interlace = 0; +static int do_interlace_dct = 0; +static int do_interlace_me = 0; static int workaround_bugs = FF_BUG_AUTODETECT; static int error_resilience = 2; static int error_concealment = 3; @@ -130,8 +157,13 @@ static int use_part = 0; static int packet_size = 0; static int error_rate = 0; static int strict = 0; +static int top_field_first = -1; +static int noise_reduction = 0; +static int sc_threshold = 0; static int debug = 0; static int debug_mv = 0; +static int me_threshold = 0; +static int mb_threshold = 0; extern int loop_input; /* currently a hack */ static int gop_size = 12; @@ -144,6 +176,7 @@ static int audio_codec_id = CODEC_ID_NONE; static int64_t recording_time = 0; static int64_t start_time = 0; +static int64_t rec_timestamp = 0; static int file_overwrite = 0; static char *str_title = NULL; static char *str_author = NULL; @@ -159,6 +192,7 @@ static int bitexact = 0; static char *pass_logfilename = NULL; static int audio_stream_copy = 0; static int video_stream_copy = 0; +static int sync_method= 1; static int rate_emu = 0; @@ -173,6 +207,12 @@ static char *audio_device = NULL; static int using_stdin = 0; static int using_vhook = 0; static int verbose = 1; +static int thread_count= 1; +static int q_pressed = 0; +static int me_range = 0; +static int64_t video_size = 0; +static int64_t audio_size = 0; +static int64_t extra_size = 0; #define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass" @@ -190,13 +230,19 @@ typedef struct AVOutputStream { int64_t sync_opts; /* video only */ int video_resample; /* video_resample and video_crop are mutually exclusive */ - AVPicture pict_tmp; /* temporary image for resampling */ + AVFrame pict_tmp; /* temporary image for resampling */ ImgReSampleContext *img_resample_ctx; /* for image resampling */ int video_crop; /* video_resample and video_crop are mutually exclusive */ int topBand; /* cropping area sizes */ int leftBand; + int video_pad; /* video_resample and video_pad are mutually exclusive */ + int padtop; /* padding area sizes */ + int padbottom; + int padleft; + int padright; + /* audio only */ int audio_resample; ReSampleContext *resample; /* for audio resampling */ @@ -302,6 +348,11 @@ static int read_key(void) return -1; } +static int decode_interrupt_cb(void) +{ + return q_pressed || (q_pressed = read_key() == 'q'); +} + #else static volatile int received_sigterm = 0; @@ -393,6 +444,7 @@ static void do_audio_out(AVFormatContext *s, &ost->fifo.rptr) == 0) { ret = avcodec_encode_audio(enc, audio_out, audio_out_size, (short *)audio_buf); + audio_size += ret; av_write_frame(s, ost->index, audio_out, ret); } } else { @@ -410,6 +462,7 @@ static void do_audio_out(AVFormatContext *s, } ret = avcodec_encode_audio(enc, audio_out, size_out, (short *)buftmp); + audio_size += ret; av_write_frame(s, ost->index, audio_out, ret); } } @@ -467,6 +520,40 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void /* we begin to correct av delay at this threshold */ #define AV_DELAY_MAX 0.100 + +/* Expects img to be yuv420 */ +static void fill_pad_region(AVPicture* img, int height, int width, + int padtop, int padbottom, int padleft, int padright, int *color) { + + int i, y, shift; + uint8_t *optr; + + for (i = 0; i < 3; i++) { + shift = (i == 0) ? 0 : 1; + + if (padtop || padleft) { + memset(img->data[i], color[i], (((img->linesize[i] * padtop) + + padleft) >> shift)); + } + + if (padleft || padright) { + optr = img->data[i] + (img->linesize[i] * (padtop >> shift)) + + (img->linesize[i] - (padright >> shift)); + + for (y = 0; y < ((height - (padtop + padbottom)) >> shift); y++) { + memset(optr, color[i], (padleft + padright) >> shift); + optr += img->linesize[i]; + } + } + + if (padbottom) { + optr = img->data[i] + (img->linesize[i] * ((height - padbottom) >> shift)); + memset(optr, color[i], ((img->linesize[i] * padbottom) >> shift)); + } + } +} + + static void do_video_out(AVFormatContext *s, AVOutputStream *ost, AVInputStream *ist, @@ -474,15 +561,18 @@ static void do_video_out(AVFormatContext *s, int *frame_size, AVOutputStream *audio_sync) { int nb_frames, i, ret; - AVPicture *final_picture, *formatted_picture; - AVPicture picture_format_temp, picture_crop_temp; - static uint8_t *video_buffer; + AVFrame *final_picture, *formatted_picture; + AVFrame picture_format_temp, picture_crop_temp; + static uint8_t *video_buffer= NULL; uint8_t *buf = NULL, *buf1 = NULL; AVCodecContext *enc, *dec; enum PixelFormat target_pixfmt; - + #define VIDEO_BUFFER_SIZE (1024*1024) + avcodec_get_frame_defaults(&picture_format_temp); + avcodec_get_frame_defaults(&picture_crop_temp); + enc = &ost->st->codec; dec = &ist->st->codec; @@ -494,6 +584,7 @@ static void do_video_out(AVFormatContext *s, /* NOTE: the A/V sync is always done by considering the audio is the master clock. It is suffisant for transcoding or playing, but not for the general case */ + if(sync_method){ if (audio_sync) { /* compute the A-V delay and duplicate/remove frames if needed */ double adelta, vdelta, av_delay; @@ -505,11 +596,11 @@ static void do_video_out(AVFormatContext *s, s->pts_num / s->pts_den); av_delay = adelta - vdelta; - // printf("delay=%f\n", av_delay); if (av_delay < -AV_DELAY_MAX) nb_frames = 2; else if (av_delay > AV_DELAY_MAX) nb_frames = 0; +// printf("delay=%f nb=%d (A)\n", av_delay, nb_frames); } else { double vdelta; @@ -524,19 +615,22 @@ static void do_video_out(AVFormatContext *s, if (!ost->sync_ipts_offset) ost->sync_ipts_offset = 0.000001; /* one microsecond */ } +// printf("delay=%f nb=%d (V)\n",vdelta, nb_frames); } + } #if defined(AVSYNC_DEBUG) { static char *action[] = { "drop frame", "copy frame", "dup frame" }; - if (audio_sync) + if (audio_sync && verbose >=0) { fprintf(stderr, "Input APTS %12.6f, output APTS %12.6f, ", (double) audio_sync->sync_ipts, (double) audio_sync->st->pts.val * s->pts_num / s->pts_den); - fprintf(stderr, "Input VPTS %12.6f, output VPTS %12.6f: %s\n", - (double) ost->sync_ipts, - (double) ost->st->pts.val * s->pts_num / s->pts_den, - action[nb_frames]); + fprintf(stderr, "Input VPTS %12.6f, output VPTS %12.6f: %s\n", + (double) ost->sync_ipts, + (double) ost->st->pts.val * s->pts_num / s->pts_den, + action[nb_frames]); + } } #endif @@ -549,7 +643,8 @@ static void do_video_out(AVFormatContext *s, return; /* convert pixel format if needed */ - target_pixfmt = ost->video_resample ? PIX_FMT_YUV420P : enc->pix_fmt; + target_pixfmt = ost->video_resample || ost->video_pad + ? PIX_FMT_YUV420P : enc->pix_fmt; if (dec->pix_fmt != target_pixfmt) { int size; @@ -559,24 +654,34 @@ static void do_video_out(AVFormatContext *s, if (!buf) return; formatted_picture = &picture_format_temp; - avpicture_fill(formatted_picture, buf, target_pixfmt, dec->width, dec->height); + avpicture_fill((AVPicture*)formatted_picture, buf, target_pixfmt, dec->width, dec->height); - if (img_convert(formatted_picture, target_pixfmt, + if (img_convert((AVPicture*)formatted_picture, target_pixfmt, (AVPicture *)in_picture, dec->pix_fmt, dec->width, dec->height) < 0) { - fprintf(stderr, "pixel format conversion not handled\n"); + + if (verbose >= 0) + fprintf(stderr, "pixel format conversion not handled\n"); + goto the_end; } } else { - formatted_picture = (AVPicture *)in_picture; + formatted_picture = in_picture; } - /* XXX: resampling could be done before raw format convertion in + /* XXX: resampling could be done before raw format conversion in some cases to go faster */ /* XXX: only works for YUV420P */ if (ost->video_resample) { final_picture = &ost->pict_tmp; - img_resample(ost->img_resample_ctx, final_picture, formatted_picture); + img_resample(ost->img_resample_ctx, (AVPicture*)final_picture, (AVPicture*)formatted_picture); + + if (ost->padtop || ost->padbottom || ost->padleft || ost->padright) { + fill_pad_region((AVPicture*)final_picture, enc->height, enc->width, + ost->padtop, ost->padbottom, ost->padleft, ost->padright, + padcolor); + } + if (enc->pix_fmt != PIX_FMT_YUV420P) { int size; @@ -587,12 +692,15 @@ static void do_video_out(AVFormatContext *s, if (!buf) return; final_picture = &picture_format_temp; - avpicture_fill(final_picture, buf, enc->pix_fmt, enc->width, enc->height); + avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); - if (img_convert(final_picture, enc->pix_fmt, - &ost->pict_tmp, PIX_FMT_YUV420P, + if (img_convert((AVPicture*)final_picture, enc->pix_fmt, + (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, enc->width, enc->height) < 0) { - fprintf(stderr, "pixel format conversion not handled\n"); + + if (verbose >= 0) + fprintf(stderr, "pixel format conversion not handled\n"); + goto the_end; } } @@ -612,6 +720,54 @@ static void do_video_out(AVFormatContext *s, picture_crop_temp.linesize[1] = formatted_picture->linesize[1]; picture_crop_temp.linesize[2] = formatted_picture->linesize[2]; final_picture = &picture_crop_temp; + } else if (ost->video_pad) { + final_picture = &ost->pict_tmp; + + for (i = 0; i < 3; i++) { + uint8_t *optr, *iptr; + int shift = (i == 0) ? 0 : 1; + int y, yheight; + + /* set offset to start writing image into */ + optr = final_picture->data[i] + (((final_picture->linesize[i] * + ost->padtop) + ost->padleft) >> shift); + iptr = formatted_picture->data[i]; + + yheight = (enc->height - ost->padtop - ost->padbottom) >> shift; + for (y = 0; y < yheight; y++) { + /* copy unpadded image row into padded image row */ + memcpy(optr, iptr, formatted_picture->linesize[i]); + optr += final_picture->linesize[i]; + iptr += formatted_picture->linesize[i]; + } + } + + fill_pad_region((AVPicture*)final_picture, enc->height, enc->width, + ost->padtop, ost->padbottom, ost->padleft, ost->padright, + padcolor); + + if (enc->pix_fmt != PIX_FMT_YUV420P) { + int size; + + av_free(buf); + /* create temporary picture */ + size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height); + buf = av_malloc(size); + if (!buf) + return; + final_picture = &picture_format_temp; + avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); + + if (img_convert((AVPicture*)final_picture, enc->pix_fmt, + (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, + enc->width, enc->height) < 0) { + + if (verbose >= 0) + fprintf(stderr, "pixel format conversion not handled\n"); + + goto the_end; + } + } } else { final_picture = formatted_picture; } @@ -629,13 +785,17 @@ static void do_video_out(AVFormatContext *s, enc->coded_frame = old_frame; } else { AVFrame big_picture; - - memset(&big_picture, 0, sizeof(AVFrame)); - *(AVPicture*)&big_picture= *final_picture; + + big_picture= *final_picture; /* better than nothing: use input picture interlaced settings */ big_picture.interlaced_frame = in_picture->interlaced_frame; - big_picture.top_field_first = in_picture->top_field_first; + if(do_interlace_me || do_interlace_dct){ + if(top_field_first == -1) + big_picture.top_field_first = in_picture->top_field_first; + else + big_picture.top_field_first = 1; + } /* handles sameq here. This is not correct because it may not be a global option */ @@ -643,7 +803,9 @@ static void do_video_out(AVFormatContext *s, big_picture.quality = ist->st->quality; }else big_picture.quality = ost->st->quality; - + if(!me_threshold) + big_picture.pict_type = 0; + big_picture.pts = AV_NOPTS_VALUE; //FIXME ret = avcodec_encode_video(enc, video_buffer, VIDEO_BUFFER_SIZE, &big_picture); @@ -674,7 +836,6 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, int frame_size) { static FILE *fvstats=NULL; - static int64_t total_size = 0; char filename[40]; time_t today2; struct tm *today; @@ -698,7 +859,6 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, ti = MAXINT64; enc = &ost->st->codec; - total_size += frame_size; if (enc->codec_type == CODEC_TYPE_VIDEO) { frame_number = ost->frame_number; fprintf(fvstats, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality/(float)FF_QP2LAMBDA); @@ -712,9 +872,9 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, ti1 = 0.01; bitrate = (double)(frame_size * 8) * enc->frame_rate / enc->frame_rate_base / 1000.0; - avg_bitrate = (double)(total_size * 8) / ti1 / 1000.0; + avg_bitrate = (double)(video_size * 8) / ti1 / 1000.0; fprintf(fvstats, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", - (double)total_size / 1024, ti1, bitrate, avg_bitrate); + (double)video_size / 1024, ti1, bitrate, avg_bitrate); fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type)); } } @@ -805,18 +965,28 @@ static void print_report(AVFormatContext **output_files, "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s", (double)total_size / 1024, ti1, bitrate); - fprintf(stderr, "%s \r", buf); + if (verbose >= 0) + fprintf(stderr, "%s \r", buf); + fflush(stderr); } - if (is_last_report) + if (is_last_report && verbose >= 0){ + int64_t raw= audio_size + video_size + extra_size; fprintf(stderr, "\n"); + fprintf(stderr, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n", + video_size/1024.0, + audio_size/1024.0, + extra_size/1024.0, + 100.0*(total_size - raw)/raw + ); + } } /* pkt = NULL means EOF (needed to flush decoder buffers) */ static int output_packet(AVInputStream *ist, int ist_index, AVOutputStream **ost_table, int nb_ostreams, - AVPacket *pkt) + const AVPacket *pkt) { AVFormatContext *os; AVOutputStream *ost; @@ -827,7 +997,7 @@ static int output_packet(AVInputStream *ist, int ist_index, AVFrame picture; short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2]; void *buffer_to_free; - + if (pkt && pkt->pts != AV_NOPTS_VALUE) { ist->pts = pkt->pts; } else { @@ -866,13 +1036,14 @@ static int output_packet(AVInputStream *ist, int ist_index, continue; } data_buf = (uint8_t *)samples; - ist->next_pts += ((int64_t)AV_TIME_BASE * data_size) / - (2 * ist->st->codec.channels); + ist->next_pts += ((int64_t)AV_TIME_BASE/2 * data_size) / + (ist->st->codec.sample_rate * ist->st->codec.channels); break; case CODEC_TYPE_VIDEO: data_size = (ist->st->codec.width * ist->st->codec.height * 3) / 2; /* XXX: allocate picture correctly */ - memset(&picture, 0, sizeof(picture)); + avcodec_get_frame_defaults(&picture); + ret = avcodec_decode_video(&ist->st->codec, &picture, &got_picture, ptr, len); ist->st->quality= picture.quality; @@ -972,6 +1143,7 @@ static int output_packet(AVInputStream *ist, int ist_index, } do_video_out(os, ost, ist, &picture, &frame_size, audio_sync); + video_size += frame_size; if (do_vstats && frame_size) do_video_stats(os, ost, frame_size); } @@ -985,10 +1157,11 @@ static int output_packet(AVInputStream *ist, int ist_index, /* no reencoding needed : output the packet directly */ /* force the input stream PTS */ - memset(&avframe, 0, sizeof(AVFrame)); + avcodec_get_frame_defaults(&avframe); ost->st->codec.coded_frame= &avframe; avframe.key_frame = pkt->flags & PKT_FLAG_KEY; - + ost->st->pts.val= av_rescale(ist->pts, os->pts_den, os->pts_num*AV_TIME_BASE); + av_write_frame(os, ost->index, data_buf, data_size); ost->st->codec.frame_number++; ost->frame_number++; @@ -1169,6 +1342,7 @@ static int av_encode(AVFormatContext **output_files, case CODEC_TYPE_AUDIO: codec->sample_rate = icodec->sample_rate; codec->channels = icodec->channels; + codec->frame_size = icodec->frame_size; break; case CODEC_TYPE_VIDEO: codec->frame_rate = icodec->frame_rate; @@ -1231,10 +1405,15 @@ static int av_encode(AVFormatContext **output_files, frame_topBand == 0 && frame_bottomBand == 0 && frame_leftBand == 0 && - frame_rightBand == 0) + frame_rightBand == 0 && + frame_padtop == 0 && + frame_padbottom == 0 && + frame_padleft == 0 && + frame_padright == 0) { ost->video_resample = 0; ost->video_crop = 0; + ost->video_pad = 0; } else if ((codec->width == icodec->width - (frame_leftBand + frame_rightBand)) && (codec->height == icodec->height - @@ -1244,25 +1423,42 @@ static int av_encode(AVFormatContext **output_files, ost->video_crop = 1; ost->topBand = frame_topBand; ost->leftBand = frame_leftBand; + } else if ((codec->width == icodec->width + + (frame_padleft + frame_padright)) && + (codec->height == icodec->height + + (frame_padtop + frame_padbottom))) { + ost->video_resample = 0; + ost->video_crop = 0; + ost->video_pad = 1; + ost->padtop = frame_padtop; + ost->padleft = frame_padleft; + ost->padbottom = frame_padbottom; + ost->padright = frame_padright; + avcodec_get_frame_defaults(&ost->pict_tmp); + if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, + codec->width, codec->height ) ) + goto fail; } else { - uint8_t *buf; ost->video_resample = 1; ost->video_crop = 0; // cropping is handled as part of resample - buf = av_malloc((codec->width * codec->height * 3) / 2); - if (!buf) + avcodec_get_frame_defaults(&ost->pict_tmp); + if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, + codec->width, codec->height ) ) goto fail; - ost->pict_tmp.data[0] = buf; - ost->pict_tmp.data[1] = ost->pict_tmp.data[0] + (codec->width * codec->height); - ost->pict_tmp.data[2] = ost->pict_tmp.data[1] + (codec->width * codec->height) / 4; - ost->pict_tmp.linesize[0] = codec->width; - ost->pict_tmp.linesize[1] = codec->width / 2; - ost->pict_tmp.linesize[2] = codec->width / 2; ost->img_resample_ctx = img_resample_full_init( ost->st->codec.width, ost->st->codec.height, ist->st->codec.width, ist->st->codec.height, frame_topBand, frame_bottomBand, - frame_leftBand, frame_rightBand); + frame_leftBand, frame_rightBand, + frame_padtop, frame_padbottom, + frame_padleft, frame_padright); + + ost->padtop = frame_padtop; + ost->padleft = frame_padleft; + ost->padbottom = frame_padbottom; + ost->padright = frame_padright; + } ost->encoding_needed = 1; ist->decoding_needed = 1; @@ -1303,7 +1499,7 @@ static int av_encode(AVFormatContext **output_files, fprintf(stderr, "Could not allocate log buffer\n"); exit(1); } - fread(logbuffer, 1, size, f); + size = fread(logbuffer, 1, size, f); fclose(f); logbuffer[size] = '\0'; codec->stats_in = logbuffer; @@ -1319,14 +1515,16 @@ static int av_encode(AVFormatContext **output_files, } /* dump the stream mapping */ - fprintf(stderr, "Stream mapping:\n"); - for(i=0;i #%d.%d\n", - ist_table[ost->source_index]->file_index, - ist_table[ost->source_index]->index, - ost->file_index, - ost->index); + if (verbose >= 0) { + fprintf(stderr, "Stream mapping:\n"); + for(i=0;i #%d.%d\n", + ist_table[ost->source_index]->file_index, + ist_table[ost->source_index]->index, + ost->file_index, + ost->index); + } } /* open each encoder */ @@ -1345,6 +1543,7 @@ static int av_encode(AVFormatContext **output_files, ost->file_index, ost->index); exit(1); } + extra_size += ost->st->codec.extradata_size; } } @@ -1393,8 +1592,10 @@ static int av_encode(AVFormatContext **output_files, } #ifndef CONFIG_WIN32 - if ( !using_stdin ) + if ( !using_stdin && verbose >= 0) { fprintf(stderr, "Press [q] to stop encoding\n"); + url_set_interrupt_cb(decode_interrupt_cb); + } #endif term_init(); @@ -1409,6 +1610,8 @@ static int av_encode(AVFormatContext **output_files, redo: /* if 'q' pressed, exits */ if (!using_stdin) { + if (q_pressed) + break; /* read_key() returns 0 on EOF */ key = read_key(); if (key == 'q') @@ -1446,6 +1649,7 @@ static int av_encode(AVFormatContext **output_files, file_table[file_index].eof_reached = 1; continue; } + if (!pkt.size) { stream_no_data = is; } else { @@ -1465,8 +1669,11 @@ static int av_encode(AVFormatContext **output_files, //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size); if (output_packet(ist, ist_index, ost_table, nb_ostreams, &pkt) < 0) { - fprintf(stderr, "Error while decoding stream #%d.%d\n", - ist->file_index, ist->index); + + if (verbose >= 0) + fprintf(stderr, "Error while decoding stream #%d.%d\n", + ist->file_index, ist->index); + av_free_packet(&pkt); goto redo; } @@ -1488,6 +1695,12 @@ static int av_encode(AVFormatContext **output_files, term_exit(); + /* write the trailer if needed and close file */ + for(i=0;ist->codec); } } - - /* write the trailer if needed and close file */ - for(i=0;i> SCALEBITS) + +#define RGB_TO_U(r1, g1, b1, shift)\ +(((- FIX(0.16874) * r1 - FIX(0.33126) * g1 + \ + FIX(0.50000) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) + +#define RGB_TO_V(r1, g1, b1, shift)\ +(((FIX(0.50000) * r1 - FIX(0.41869) * g1 - \ + FIX(0.08131) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) + +static void opt_pad_color(const char *arg) { + /* Input is expected to be six hex digits similar to + how colors are expressed in html tags (but without the #) */ + int rgb = strtol(arg, NULL, 16); + int r,g,b; + + r = (rgb >> 16); + g = ((rgb >> 8) & 255); + b = (rgb & 255); + + padcolor[0] = RGB_TO_Y(r,g,b); + padcolor[1] = RGB_TO_U(r,g,b,0); + padcolor[2] = RGB_TO_V(r,g,b,0); +} + +static void opt_frame_pad_top(const char *arg) +{ + frame_padtop = atoi(arg); + if (frame_padtop < 0) { + fprintf(stderr, "Incorrect top pad size\n"); + exit(1); + } + if ((frame_padtop % 2) != 0) { + fprintf(stderr, "Top pad size must be a multiple of 2\n"); + exit(1); + } +} + +static void opt_frame_pad_bottom(const char *arg) +{ + frame_padbottom = atoi(arg); + if (frame_padbottom < 0) { + fprintf(stderr, "Incorrect bottom pad size\n"); + exit(1); + } + if ((frame_padbottom % 2) != 0) { + fprintf(stderr, "Bottom pad size must be a multiple of 2\n"); + exit(1); + } +} + + +static void opt_frame_pad_left(const char *arg) +{ + frame_padleft = atoi(arg); + if (frame_padleft < 0) { + fprintf(stderr, "Incorrect left pad size\n"); + exit(1); + } + if ((frame_padleft % 2) != 0) { + fprintf(stderr, "Left pad size must be a multiple of 2\n"); + exit(1); + } +} + + +static void opt_frame_pad_right(const char *arg) +{ + frame_padright = atoi(arg); + if (frame_padright < 0) { + fprintf(stderr, "Incorrect right pad size\n"); + exit(1); + } + if ((frame_padright % 2) != 0) { + fprintf(stderr, "Right pad size must be a multiple of 2\n"); + exit(1); + } +} + + static void opt_frame_pix_fmt(const char *arg) { frame_pix_fmt = avcodec_get_pix_fmt(arg); @@ -1830,6 +2139,11 @@ static void opt_mb_cmp(const char *arg) mb_cmp = atoi(arg); } +static void opt_ildct_cmp(const char *arg) +{ + ildct_cmp = atoi(arg); +} + static void opt_sub_cmp(const char *arg) { sub_cmp = atoi(arg); @@ -1840,6 +2154,41 @@ static void opt_cmp(const char *arg) cmp = atoi(arg); } +static void opt_pre_cmp(const char *arg) +{ + pre_cmp = atoi(arg); +} + +static void opt_pre_me(const char *arg) +{ + pre_me = atoi(arg); +} + +static void opt_lumi_mask(const char *arg) +{ + lumi_mask = atof(arg); +} + +static void opt_dark_mask(const char *arg) +{ + dark_mask = atof(arg); +} + +static void opt_scplx_mask(const char *arg) +{ + scplx_mask = atof(arg); +} + +static void opt_tcplx_mask(const char *arg) +{ + tcplx_mask = atof(arg); +} + +static void opt_p_mask(const char *arg) +{ + p_mask = atof(arg); +} + static void opt_qscale(const char *arg) { video_qscale = atof(arg); @@ -1850,6 +2199,16 @@ static void opt_qscale(const char *arg) } } +static void opt_lmax(const char *arg) +{ + video_lmax = atof(arg)*FF_QP2LAMBDA; +} + +static void opt_lmin(const char *arg) +{ + video_lmin = atof(arg)*FF_QP2LAMBDA; +} + static void opt_qmin(const char *arg) { video_qmin = atoi(arg); @@ -1931,6 +2290,15 @@ static void opt_i_qoffset(const char *arg) video_i_qoffset = atof(arg); } +static void opt_ibias(const char *arg) +{ + video_intra_quant_bias = atoi(arg); +} +static void opt_pbias(const char *arg) +{ + video_inter_quant_bias = atoi(arg); +} + static void opt_packet_size(const char *arg) { packet_size= atoi(arg); @@ -1946,6 +2314,40 @@ static void opt_strict(const char *arg) strict= atoi(arg); } +static void opt_top_field_first(const char *arg) +{ + top_field_first= atoi(arg); +} + +static void opt_noise_reduction(const char *arg) +{ + noise_reduction= atoi(arg); +} + +static void opt_qns(const char *arg) +{ + qns= atoi(arg); +} + +static void opt_sc_threshold(const char *arg) +{ + sc_threshold= atoi(arg); +} + +static void opt_me_range(const char *arg) +{ + me_range = atoi(arg); +} + +static void opt_thread_count(const char *arg) +{ + thread_count= atoi(arg); +#if !defined(HAVE_PTHREADS) && !defined(HAVE_W32THREADS) + if (verbose >= 0) + fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n"); +#endif +} + static void opt_audio_bitrate(const char *arg) { audio_bit_rate = atoi(arg) * 1000; @@ -2103,6 +2505,11 @@ static void opt_start_time(const char *arg) start_time = parse_date(arg, 1); } +static void opt_rec_timestamp(const char *arg) +{ + rec_timestamp = parse_date(arg, 0) / 1000000; +} + static void opt_input_file(const char *filename) { AVFormatContext *ic; @@ -2121,8 +2528,8 @@ static void opt_input_file(const char *filename) ap->channels = audio_channels; ap->frame_rate = frame_rate; ap->frame_rate_base = frame_rate_base; - ap->width = frame_width; - ap->height = frame_height; + ap->width = frame_width + frame_padleft + frame_padright; + ap->height = frame_height + frame_padtop + frame_padbottom; ap->image_format = image_format; ap->pix_fmt = frame_pix_fmt; @@ -2136,7 +2543,7 @@ static void opt_input_file(const char *filename) /* If not enough info to get the stream parameters, we decode the first frames to get it. (used in mpeg case for example) */ ret = av_find_stream_info(ic); - if (ret < 0) { + if (ret < 0 && verbose >= 0) { fprintf(stderr, "%s: could not find codec parameters\n", filename); exit(1); } @@ -2161,6 +2568,11 @@ static void opt_input_file(const char *filename) /* update the current parameters so that they match the one of the input stream */ for(i=0;inb_streams;i++) { AVCodecContext *enc = &ic->streams[i]->codec; +#if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) + if(thread_count>1) + avcodec_thread_init(enc, thread_count); +#endif + enc->thread_count= thread_count; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: //fprintf(stderr, "\nInput Audio channels: %d", enc->channels); @@ -2182,11 +2594,16 @@ static void opt_input_file(const char *filename) enc->debug_mv = debug_mv; if(bitexact) enc->flags|= CODEC_FLAG_BITEXACT; + if(me_threshold) + enc->debug |= FF_DEBUG_MV; assert(enc->frame_rate_base == rfps_base); // should be true for now if (enc->frame_rate != rfps) { - fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f->%2.2f\n", - i, (float)enc->frame_rate / enc->frame_rate_base, + + if (verbose >= 0) + fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f->%2.2f\n", + i, (float)enc->frame_rate / enc->frame_rate_base, + (float)rfps / rfps_base); } /* update the current frame rate to match the stream frame rate */ @@ -2204,7 +2621,9 @@ static void opt_input_file(const char *filename) input_files[nb_input_files] = ic; /* dump the file content */ - dump_format(ic, nb_input_files, filename, 0); + if (verbose >= 0) + dump_format(ic, nb_input_files, filename, 0); + nb_input_files++; file_iformat = NULL; file_oformat = NULL; @@ -2231,6 +2650,8 @@ static void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr) case CODEC_TYPE_VIDEO: has_video = 1; break; + case CODEC_TYPE_DATA: + break; default: av_abort(); } @@ -2251,7 +2672,7 @@ static void opt_output_file(const char *filename) if (!strcmp(filename, "-")) filename = "pipe:"; - oc = av_mallocz(sizeof(AVFormatContext)); + oc = av_alloc_format_context(); if (!file_oformat) { file_oformat = guess_format(NULL, filename, NULL); @@ -2273,8 +2694,8 @@ static void opt_output_file(const char *filename) exit(1); } } else { - use_video = file_oformat->video_codec != CODEC_ID_NONE; - use_audio = file_oformat->audio_codec != CODEC_ID_NONE; + use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy; + use_audio = file_oformat->audio_codec != CODEC_ID_NONE || audio_stream_copy; /* disable if no corresponding type found and at least one input file */ @@ -2304,6 +2725,10 @@ static void opt_output_file(const char *filename) exit(1); } avcodec_get_context_defaults(&st->codec); +#if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) + if(thread_count>1) + avcodec_thread_init(&st->codec, thread_count); +#endif video_enc = &st->codec; @@ -2327,8 +2752,8 @@ static void opt_output_file(const char *filename) video_enc->frame_rate = frame_rate; video_enc->frame_rate_base = frame_rate_base; - video_enc->width = frame_width; - video_enc->height = frame_height; + video_enc->width = frame_width + frame_padright + frame_padleft; + video_enc->height = frame_height + frame_padtop + frame_padbottom; video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255); video_enc->pix_fmt = frame_pix_fmt; @@ -2351,12 +2776,24 @@ static void opt_output_file(const char *filename) video_enc->mb_decision = mb_decision; video_enc->mb_cmp = mb_cmp; + video_enc->ildct_cmp = ildct_cmp; video_enc->me_sub_cmp = sub_cmp; video_enc->me_cmp = cmp; + video_enc->me_pre_cmp = pre_cmp; + video_enc->pre_me = pre_me; + video_enc->lumi_masking = lumi_mask; + video_enc->dark_masking = dark_mask; + video_enc->spatial_cplx_masking = scplx_mask; + video_enc->temporal_cplx_masking = tcplx_mask; + video_enc->p_masking = p_mask; + video_enc->quantizer_noise_shaping= qns; if (use_umv) { video_enc->flags |= CODEC_FLAG_H263P_UMV; } + if (use_ss) { + video_enc->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; + } if (use_aic) { video_enc->flags |= CODEC_FLAG_H263P_AIC; } @@ -2369,20 +2806,43 @@ static void opt_output_file(const char *filename) if (use_obmc) { video_enc->flags |= CODEC_FLAG_OBMC; } + if (use_loop) { + video_enc->flags |= CODEC_FLAG_LOOP_FILTER; + } if(use_part) { video_enc->flags |= CODEC_FLAG_PART; } + if (use_alt_scan) { + video_enc->flags |= CODEC_FLAG_ALT_SCAN; + } + if (use_trell) { + video_enc->flags |= CODEC_FLAG_TRELLIS_QUANT; + } + if (use_scan_offset) { + video_enc->flags |= CODEC_FLAG_SVCD_SCAN_OFFSET; + } + if (closed_gop) { + video_enc->flags |= CODEC_FLAG_CLOSED_GOP; + } + if (use_qpel) { + video_enc->flags |= CODEC_FLAG_QPEL; + } if (b_frames) { video_enc->max_b_frames = b_frames; video_enc->b_frame_strategy = 0; video_enc->b_quant_factor = 2.0; } - if (do_interlace) { + if (do_interlace_dct) { video_enc->flags |= CODEC_FLAG_INTERLACED_DCT; } + if (do_interlace_me) { + video_enc->flags |= CODEC_FLAG_INTERLACED_ME; + } video_enc->qmin = video_qmin; video_enc->qmax = video_qmax; + video_enc->lmin = video_lmin; + video_enc->lmax = video_lmax; video_enc->mb_qmin = video_mb_qmin; video_enc->mb_qmax = video_mb_qmax; video_enc->max_qdiff = video_qdiff; @@ -2390,7 +2850,8 @@ static void opt_output_file(const char *filename) video_enc->qcompress = video_qcomp; video_enc->rc_eq = video_rc_eq; video_enc->debug = debug; - video_enc->debug_mv = debug_mv; + video_enc->debug_mv = debug_mv; + video_enc->thread_count = thread_count; p= video_rc_override_string; for(i=0; p; i++){ int start, end, q; @@ -2426,10 +2887,18 @@ static void opt_output_file(const char *filename) video_enc->b_quant_factor = video_b_qfactor; video_enc->i_quant_offset = video_i_qoffset; video_enc->b_quant_offset = video_b_qoffset; + video_enc->intra_quant_bias = video_intra_quant_bias; + video_enc->inter_quant_bias = video_inter_quant_bias; video_enc->dct_algo = dct_algo; video_enc->idct_algo = idct_algo; + video_enc->me_threshold= me_threshold; + video_enc->mb_threshold= mb_threshold; video_enc->strict_std_compliance = strict; video_enc->error_rate = error_rate; + video_enc->noise_reduction= noise_reduction; + video_enc->scenechange_threshold= sc_threshold; + video_enc->me_range = me_range; + if(packet_size){ video_enc->rtp_mode= 1; video_enc->rtp_payload_size= packet_size; @@ -2462,6 +2931,10 @@ static void opt_output_file(const char *filename) exit(1); } avcodec_get_context_defaults(&st->codec); +#if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) + if(thread_count>1) + avcodec_thread_init(&st->codec, thread_count); +#endif audio_enc = &st->codec; audio_enc->codec_type = CODEC_TYPE_AUDIO; @@ -2478,6 +2951,8 @@ static void opt_output_file(const char *filename) audio_enc->bit_rate = audio_bit_rate; audio_enc->sample_rate = audio_sample_rate; + audio_enc->strict_std_compliance = strict; + audio_enc->thread_count = thread_count; /* For audio codecs other than AC3 we limit */ /* the number of coded channels to stereo */ if (audio_channels > 2 && codec_id != CODEC_ID_AC3) { @@ -2496,7 +2971,9 @@ static void opt_output_file(const char *filename) exit(1); } - if (str_title) + oc->timestamp = rec_timestamp; + + if (str_title) pstrcpy(oc->title, sizeof(oc->title), str_title); if (str_author) pstrcpy(oc->author, sizeof(oc->author), str_author); @@ -2639,7 +3116,10 @@ static void prepare_grab(void) ic->streams[0]->r_frame_rate = vp->frame_rate; ic->streams[0]->r_frame_rate_base = vp->frame_rate_base; input_files[nb_input_files] = ic; - dump_format(ic, nb_input_files, "", 0); + + if (verbose >= 0) + dump_format(ic, nb_input_files, "", 0); + nb_input_files++; } if (has_audio && audio_grab_format) { @@ -2651,7 +3131,10 @@ static void prepare_grab(void) exit(1); } input_files[nb_input_files] = ic; - dump_format(ic, nb_input_files, "", 0); + + if (verbose >= 0) + dump_format(ic, nb_input_files, "", 0); + nb_input_files++; } } @@ -2698,59 +3181,101 @@ static void show_formats(void) AVOutputFormat *ofmt; AVImageFormat *image_fmt; URLProtocol *up; - AVCodec *p; - const char **pp; - - printf("Output audio/video file formats:"); - for(ofmt = first_oformat; ofmt != NULL; ofmt = ofmt->next) { - printf(" %s", ofmt->name); - } - printf("\n"); - - printf("Input audio/video file formats:"); - for(ifmt = first_iformat; ifmt != NULL; ifmt = ifmt->next) { - printf(" %s", ifmt->name); - } - printf("\n"); - - printf("Output image formats:"); - for(image_fmt = first_image_format; image_fmt != NULL; - image_fmt = image_fmt->next) { - if (image_fmt->img_write) - printf(" %s", image_fmt->name); + AVCodec *p, *p2; + const char **pp, *last_name; + + printf("File formats:\n"); + last_name= "000"; + for(;;){ + int decode=0; + int encode=0; + const char *name=NULL; + + for(ofmt = first_oformat; ofmt != NULL; ofmt = ofmt->next) { + if((name == NULL || strcmp(ofmt->name, name)<0) && + strcmp(ofmt->name, last_name)>0){ + name= ofmt->name; + encode=1; + } + } + for(ifmt = first_iformat; ifmt != NULL; ifmt = ifmt->next) { + if((name == NULL || strcmp(ifmt->name, name)<0) && + strcmp(ifmt->name, last_name)>0){ + name= ifmt->name; + encode=0; + } + if(name && strcmp(ifmt->name, name)==0) + decode=1; + } + if(name==NULL) + break; + last_name= name; + + printf( + " %s%s %s\n", + decode ? "D":" ", + encode ? "E":" ", + name); } printf("\n"); - printf("Input image formats:"); + printf("Image formats:\n"); for(image_fmt = first_image_format; image_fmt != NULL; image_fmt = image_fmt->next) { - if (image_fmt->img_read) - printf(" %s", image_fmt->name); + printf( + " %s%s %s\n", + image_fmt->img_read ? "D":" ", + image_fmt->img_write ? "E":" ", + image_fmt->name); } printf("\n"); printf("Codecs:\n"); - printf(" Encoders:"); - for(p = first_avcodec; p != NULL; p = p->next) { - if (p->encode) - printf(" %s", p->name); - } - printf("\n"); - - printf(" Decoders:"); - for(p = first_avcodec; p != NULL; p = p->next) { - if (p->decode) - printf(" %s", p->name); + last_name= "000"; + for(;;){ + int decode=0; + int encode=0; + int cap=0; + + p2=NULL; + for(p = first_avcodec; p != NULL; p = p->next) { + if((p2==NULL || strcmp(p->name, p2->name)<0) && + strcmp(p->name, last_name)>0){ + p2= p; + decode= encode= cap=0; + } + if(p2 && strcmp(p->name, p2->name)==0){ + if(p->decode) decode=1; + if(p->encode) encode=1; + cap |= p->capabilities; + } + } + if(p2==NULL) + break; + last_name= p2->name; + + printf( + " %s%s%s%s%s%s %s", + decode ? "D": (/*p2->decoder ? "d":*/" "), + encode ? "E":" ", + p2->type == CODEC_TYPE_AUDIO ? "A":"V", + cap & CODEC_CAP_DRAW_HORIZ_BAND ? "S":" ", + cap & CODEC_CAP_DR1 ? "D":" ", + cap & CODEC_CAP_TRUNCATED ? "T":" ", + p2->name); + /* if(p2->decoder && decode==0) + printf(" use %s for decoding", p2->decoder->name);*/ + printf("\n"); } printf("\n"); - printf("Supported file protocols:"); + printf("Supported file protocols:\n"); for(up = first_protocol; up != NULL; up = up->next) printf(" %s:", up->name); printf("\n"); - printf("Frame size, frame rate abbreviations: ntsc pal qntsc qpal sntsc spal film ntsc-film sqcif qcif cif 4cif\n"); - printf("Motion estimation methods:"); + printf("Frame size, frame rate abbreviations:\n ntsc pal qntsc qpal sntsc spal film ntsc-film sqcif qcif cif 4cif\n"); + printf("Motion estimation methods:\n"); pp = motion_str; while (*pp) { printf(" %s", *pp); @@ -2762,7 +3287,13 @@ static void show_formats(void) printf("(default)"); pp++; } - printf("\n"); + printf("\n\n"); + printf( +"Note, the names of encoders and decoders dont always match, so there are\n" +"several cases where the above table shows encoder only or decoder only entries\n" +"even though both encoding and decoding are supported for example, the h263\n" +"decoder corresponds to the h263 and h263p encoders, for file formats its even\n" +"worse\n"); exit(1); } @@ -2867,15 +3398,16 @@ static void opt_target(const char *arg) opt_video_codec("mpeg2video"); opt_audio_codec("mp2"); - opt_format("vcd"); + opt_format("svcd"); opt_frame_size(norm ? "480x480" : "480x576"); opt_gop_size(norm ? "18" : "15"); video_bit_rate = 2040000; video_rc_max_rate = 2516000; - video_rc_min_rate = 1145000; + video_rc_min_rate = 0; //1145000; video_rc_buffer_size = 224*1024*8; + use_scan_offset = 1; audio_bit_rate = 224000; audio_sample_rate = 44100; @@ -2891,7 +3423,7 @@ static void opt_target(const char *arg) video_bit_rate = 6000000; video_rc_max_rate = 9000000; - video_rc_min_rate = 1500000; + video_rc_min_rate = 0; //1500000; video_rc_buffer_size = 224*1024*8; audio_bit_rate = 448000; @@ -2916,6 +3448,7 @@ const OptionDef options[] = { { "t", HAS_ARG, {(void*)opt_recording_time}, "set the recording time", "duration" }, { "ss", HAS_ARG, {(void*)opt_start_time}, "set the start time offset", "time_off" }, { "title", HAS_ARG | OPT_STRING, {(void*)&str_title}, "set the title", "string" }, + { "timestamp", HAS_ARG, {(void*)&opt_rec_timestamp}, "set the timestamp", "time" }, { "author", HAS_ARG | OPT_STRING, {(void*)&str_author}, "set the author", "string" }, { "copyright", HAS_ARG | OPT_STRING, {(void*)&str_copyright}, "set the copyright", "string" }, { "comment", HAS_ARG | OPT_STRING, {(void*)&str_comment}, "set the comment", "string" }, @@ -2932,6 +3465,8 @@ const OptionDef options[] = { { "loop", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" }, { "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" }, { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\" or \"dvd\")", "type" }, + { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, + { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync_method}, "sync method", "" }, /* video options */ { "b", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" }, @@ -2943,12 +3478,19 @@ const OptionDef options[] = { { "cropbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_bottom}, "set bottom crop band size (in pixels)", "size" }, { "cropleft", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_left}, "set left crop band size (in pixels)", "size" }, { "cropright", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_right}, "set right crop band size (in pixels)", "size" }, + { "padtop", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_pad_top}, "set top pad band size (in pixels)", "size" }, + { "padbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_pad_bottom}, "set bottom pad band size (in pixels)", "size" }, + { "padleft", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_pad_left}, "set left pad band size (in pixels)", "size" }, + { "padright", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_pad_right}, "set right pad band size (in pixels)", "size" }, + { "padcolor", HAS_ARG | OPT_VIDEO, {(void*)opt_pad_color}, "set color of pad bands (Hex 000000 thru FFFFFF)", "color" }, { "g", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_gop_size}, "set the group of picture size", "gop_size" }, { "intra", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_only}, "use only intra frames"}, { "vn", OPT_BOOL | OPT_VIDEO, {(void*)&video_disable}, "disable video" }, { "qscale", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qscale}, "use fixed video quantiser scale (VBR)", "q" }, { "qmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qmin}, "min video quantiser scale (VBR)", "q" }, { "qmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qmax}, "max video quantiser scale (VBR)", "q" }, + { "lmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lmin}, "min video lagrange factor (VBR)", "lambda" }, + { "lmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lmax}, "max video lagrange factor (VBR)", "lambda" }, { "mbqmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_qmin}, "min macroblock quantiser scale (VBR)", "q" }, { "mbqmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_qmax}, "max macroblock quantiser scale (VBR)", "q" }, { "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" }, @@ -2959,49 +3501,75 @@ const OptionDef options[] = { { "i_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qfactor}, "qp factor between p and i frames", "factor" }, { "b_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_qoffset}, "qp offset between p and b frames", "offset" }, { "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" }, + { "ibias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_ibias}, "intra quant bias", "bias" }, + { "pbias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pbias}, "inter quant bias", "bias" }, // { "b_strategy", HAS_ARG | OPT_EXPERT, {(void*)opt_b_strategy}, "dynamic b frame selection strategy", "strategy" }, { "rc_eq", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_eq}, "set rate control equation", "equation" }, { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" }, { "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" }, { "maxrate", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_max}, "set max video bitrate tolerance (in kbit/s)", "bitrate" }, { "minrate", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_min}, "set min video bitrate tolerance (in kbit/s)", "bitrate" }, - { "bufsize", HAS_ARG | OPT_VIDEO, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kbit)", "size" }, + { "bufsize", HAS_ARG | OPT_VIDEO, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kByte)", "size" }, { "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" }, { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method", "method" }, { "dct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_dct_algo}, "set dct algo", "algo" }, { "idct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_idct_algo}, "set idct algo", "algo" }, + { "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "" }, + { "mb_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_threshold}, "macroblock threshold", "" }, { "er", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_resilience}, "set error resilience", "n" }, { "ec", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_concealment}, "set error concealment", "bit_mask" }, { "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames", "frames" }, { "hq", OPT_BOOL, {(void*)&mb_decision}, "activate high quality settings" }, { "mbd", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_decision}, "macroblock decision", "mode" }, { "mbcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_cmp}, "macroblock compare function", "cmp function" }, + { "ildctcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_ildct_cmp}, "ildct compare function", "cmp function" }, { "subcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_sub_cmp}, "subpel compare function", "cmp function" }, { "cmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_cmp}, "fullpel compare function", "cmp function" }, + { "precmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pre_cmp}, "pre motion estimation compare function", "cmp function" }, + { "preme", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pre_me}, "pre motion estimation", "" }, + { "lumi_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lumi_mask}, "luminance masking", "" }, + { "dark_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_dark_mask}, "darkness masking", "" }, + { "scplx_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_scplx_mask}, "spatial complexity masking", "" }, + { "tcplx_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_tcplx_mask}, "teporal complexity masking", "" }, + { "p_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_p_mask}, "inter masking", "" }, { "4mv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_4mv}, "use four motion vector by macroblock (MPEG4)" }, { "obmc", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_obmc}, "use overlapped block motion compensation (h263+)" }, + { "lf", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_loop}, "use loop filter (h263+)" }, { "part", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_part}, "use data partitioning (MPEG4)" }, { "bug", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_workaround_bugs}, "workaround not auto detected encoder bugs", "param" }, { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "set packet size in bits", "size" }, { "error", HAS_ARG | OPT_EXPERT, {(void*)opt_error_rate}, "error rate", "rate" }, - { "strict", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_strict}, "how strictly to follow the standarts", "strictness" }, + { "strict", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_strict}, "how strictly to follow the standards", "strictness" }, { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality}, "use same video quality as source (implies VBR)" }, { "pass", HAS_ARG | OPT_VIDEO, {(void*)&opt_pass}, "select the pass number (1 or 2)", "n" }, { "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename}, "select two pass log file name", "file" }, { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace}, "deinterlace pictures" }, - { "interlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_interlace}, - "force interlacing support in encoder (MPEG2/MPEG4)" }, + { "ildct", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_interlace_dct}, + "force interlaced dct support in encoder (MPEG2/MPEG4)" }, + { "ilme", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_interlace_me}, + "force interlaced me support in encoder (MPEG2/MPEG4)" }, { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, { "vstats", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_vstats}, "dump video coding statistics to file" }, { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, { "aic", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_aic}, "enable Advanced intra coding (h263+)" }, { "aiv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_aiv}, "enable Alternative inter vlc (h263+)" }, { "umv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_umv}, "enable Unlimited Motion Vector (h263+)" }, + { "ssm", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_ss}, "enable Slice Structured mode (h263+)" }, + { "alt", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_alt_scan}, "enable alternate scantable (MPEG2/MPEG4)" }, + { "trell", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_trell}, "enable trellis quantization" }, + { "cgop", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&closed_gop}, "closed gop" }, + { "scan_offset", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_scan_offset}, "enable SVCD Scan Offset placeholder" }, + { "qpel", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_qpel}, "enable 1/4-pel" }, { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" }, { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" }, + { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" }, + { "nr", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_noise_reduction}, "noise reduction", "" }, + { "qns", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qns}, "quantization noise shaping", "" }, + { "sc_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_sc_threshold}, "scene change threshold", "threshold" }, + { "me_range", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_range}, "limit motion vectors range (1023 for DivX player)", "range" }, /* audio options */ { "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", }, @@ -3027,6 +3595,23 @@ static void show_banner(void) static void show_license(void) { show_banner(); +#ifdef CONFIG_GPL + printf( + "This program is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" + "the Free Software Foundation; either version 2 of the License, or\n" + "(at your option) any later version.\n" + "\n" + "This program is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "GNU General Public License for more details.\n" + "\n" + "You should have received a copy of the GNU General Public License\n" + "along with this program; if not, write to the Free Software\n" + "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + ); +#else printf( "This library is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU Lesser General Public\n" @@ -3042,6 +3627,7 @@ static void show_license(void) "License along with this library; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ); +#endif exit(1); }