comparison libvo/vo_dxr3.c @ 5199:72817be5265f

Automatically use avcodec if it exists, otherwise fall back to fame (due to some unresolved problems with fame) Bitrate is set to a constant 6e6 Fixed a bug occuring with round() Fixed a little #elif bug that would cause compilation to fail when not compiling with avcodec

5198:a528f6c891b5

#include "video_out_internal.h"
#include "aspect.h"
#include "../postproc/rgb2rgb.h"
#include "../postproc/swscale.h"

#ifdef USE_LIBFAME
#include "../libfame/fame.h"
static unsigned char *outbuf = NULL;
static fame_parameters_t fame_params;
static fame_yuv_t fame_yuv;

		}

		fame_params.width = s_width;
		fame_params.height = s_height;
		fame_params.coding = "I";
		fame_params.quality = 100;
		fame_params.bitrate = 0;
		fame_params.slices_per_frame = 1;
		fame_params.frames_per_sequence = (int) round(vo_fps);
		fame_params.shape_quality = 100;
		fame_params.search_range = 8;
		fame_params.verbose = 0;
		fame_params.profile = NULL;
		

			avc_context->gop_size = 18;
		} else {
			avc_context->gop_size = 15;
		}
		avc_context->frame_rate = (int) vo_fps * FRAME_RATE_BASE;
		avc_context->bit_rate = 8e6;
		avc_context->flags = CODEC_FLAG_HQ | CODEC_FLAG_QSCALE;
		avc_context->quality = 2;
		avc_context->pix_fmt = PIX_FMT_YUV420P;
		if (avcodec_open(avc_context, avc_codec) < 0) {
			printf("VO: [dxr3] Unable to open codec\n");

		sws->swScale(sws, src, &srcStride, 0, v_height, picture_data, picture_linesize);
		draw_osd();
#ifdef USE_LIBFAME
		size = fame_encode_frame(fame_ctx, &fame_yuv, NULL);
		write(fd_video, outbuf, size);
#else USE_LIBAVCODEC
		size = avcodec_encode_video(avc_context, picture_data[0], avc_outbuf_size, &avc_picture);
		write(fd_video, picture_data[0], size);
#endif
		return 0;
	}

{
	char devname[80];
	int fdflags = O_WRONLY;

#ifdef USE_LIBFAME
	printf("VO: [dxr3] You are using fame, due to a small problem I have to disable prebuffering\n");
	noprebuf = 1;
#else
	/* Open the control interface */
	if (arg && !strcmp("noprebuf", arg)) {
		printf("VO: [dxr3] Disabling prebuffering.\n");

5199:72817be5265f

#include "video_out_internal.h"
#include "aspect.h"
#include "../postproc/rgb2rgb.h"
#include "../postproc/swscale.h"

#ifndef USE_LIBAVCODEC
#  define USE_LIBFAME
#else
#  undef USE_LIBFAME
#endif
#ifdef USE_LIBFAME
#include "../libfame/fame.h"
static unsigned char *outbuf = NULL;
static fame_parameters_t fame_params;
static fame_yuv_t fame_yuv;

		}

		fame_params.width = s_width;
		fame_params.height = s_height;
		fame_params.coding = "I";
		fame_params.quality = 90;
		fame_params.bitrate = 6e6;
		fame_params.slices_per_frame = 1;
		fame_params.frames_per_sequence = (int) (vo_fps + 0.5);
		fame_params.shape_quality = 100;
		fame_params.search_range = 8;
		fame_params.verbose = 0;
		fame_params.profile = NULL;
		

			avc_context->gop_size = 18;
		} else {
			avc_context->gop_size = 15;
		}
		avc_context->frame_rate = (int) vo_fps * FRAME_RATE_BASE;
		avc_context->bit_rate = 6e6;
		avc_context->flags = CODEC_FLAG_HQ | CODEC_FLAG_QSCALE;
		avc_context->quality = 2;
		avc_context->pix_fmt = PIX_FMT_YUV420P;
		if (avcodec_open(avc_context, avc_codec) < 0) {
			printf("VO: [dxr3] Unable to open codec\n");

		sws->swScale(sws, src, &srcStride, 0, v_height, picture_data, picture_linesize);
		draw_osd();
#ifdef USE_LIBFAME
		size = fame_encode_frame(fame_ctx, &fame_yuv, NULL);
		write(fd_video, outbuf, size);
#elif USE_LIBAVCODEC
		size = avcodec_encode_video(avc_context, picture_data[0], avc_outbuf_size, &avc_picture);
		write(fd_video, picture_data[0], size);
#endif
		return 0;
	}

{
	char devname[80];
	int fdflags = O_WRONLY;

#ifdef USE_LIBFAME
	printf("VO: [dxr3] Prebuffering is temporarily disabled\n");
	noprebuf = 1;
#else
	/* Open the control interface */
	if (arg && !strcmp("noprebuf", arg)) {
		printf("VO: [dxr3] Disabling prebuffering.\n");