comparison src/ffmpeg/ffmpeg.c @ 818:07107d476f32 trunk

[svn] - remove some more stuff - build libavcodec directly into the module

817:b3b7a4e480b2

#include <audacious/titlestring.h>
#include <audacious/vfs.h>
#include <audacious/strings.h>
#include <audacious/i18n.h>

#include "avcodec.h"
#include "avformat.h"

#define ABOUT_TXT "Adapted for use in audacious by Tony Vroon ([e-mail]) from\n \
the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC ([e-mail])\n \
and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy <[e-mail]>.\n \
This plugin based on source code " LIBAVCODEC_IDENT "\nby Fabrice Bellard from \

    (*title_real) = xmms_get_titlestring(xmms_get_gentitle_format(), tuple);
}

static void wma_playbuff(InputPlayback *playback, int out_size)
{
    FifoBuffer f;
    int sst_buff;
    
    fifo_init(&f, out_size*2);
    fifo_write(&f, wma_outbuf, out_size, &f.wptr);
    while(!fifo_read(&f, wma_s_outbuf, wma_st_buff, &f.rptr) && wma_decode)
    {
        sst_buff = wma_st_buff;
	if(wma_pause) memset(wma_s_outbuf, 0, sst_buff);	
    	while(playback->output->buffer_free() < wma_st_buff) xmms_usleep(20000);
	produce_audio(playback->output->written_time(), FMT_S16_NE,
    			    c->channels, sst_buff, (short *)wma_s_outbuf, NULL);
	memset(wma_s_outbuf, 0, sst_buff);
    }
    fifo_free(&f);
    return;
}

static void *wma_play_loop(void *arg)
{

    g_static_mutex_lock(&wma_mutex);
    while(wma_decode){

	if(wma_seekpos != -1)
	{
	    av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);
	    playback->output->flush(wma_seekpos * 1000);
	    wma_seekpos = -1;
	}

        if(av_read_frame(ic, &pkt) < 0) break;

818:07107d476f32

#include <audacious/titlestring.h>
#include <audacious/vfs.h>
#include <audacious/strings.h>
#include <audacious/i18n.h>

#include "config.h"

#include "avcodec.h"
#include "avformat.h"
#include "avutil.h"

#define ABOUT_TXT "Adapted for use in audacious by Tony Vroon ([e-mail]) from\n \
the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC ([e-mail])\n \
and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy <[e-mail]>.\n \
This plugin based on source code " LIBAVCODEC_IDENT "\nby Fabrice Bellard from \

    (*title_real) = xmms_get_titlestring(xmms_get_gentitle_format(), tuple);
}

static void wma_playbuff(InputPlayback *playback, int out_size)
{
    AVFifoBuffer f;
    int sst_buff;
    
    av_fifo_init(&f, out_size*2);
    av_fifo_write(&f, wma_outbuf, out_size);
    while(!av_fifo_read(&f, wma_s_outbuf, wma_st_buff) && wma_decode)
    {
        sst_buff = wma_st_buff;
	if(wma_pause) memset(wma_s_outbuf, 0, sst_buff);	
    	while(playback->output->buffer_free() < wma_st_buff) xmms_usleep(20000);
	produce_audio(playback->output->written_time(), FMT_S16_NE,
    			    c->channels, sst_buff, (short *)wma_s_outbuf, NULL);
	memset(wma_s_outbuf, 0, sst_buff);
    }
    av_fifo_free(&f);
    return;
}

static void *wma_play_loop(void *arg)
{

    g_static_mutex_lock(&wma_mutex);
    while(wma_decode){

	if(wma_seekpos != -1)
	{
	    av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL, 0);
	    playback->output->flush(wma_seekpos * 1000);
	    wma_seekpos = -1;
	}

        if(av_read_frame(ic, &pkt) < 0) break;