teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove SDL for playing movie audio and prepare for using an audio track

Browse source 
This breaks audio playback on movies
This commit is contained in:
Chris Robinson 2012-12-13 01:42:20 -08:00
parent 779ced0889
commit 1ffaf6625a
2 changed files with 225 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

266
apps/openmw/mwrender/videoplayer.cpp
View file

@ -4,7 +4,8 @@
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"
#include "../mwsound/sound_decoder.hpp"
#include "../mwsound/sound.hpp"
namespace MWRender namespace MWRender
@ -143,19 +144,13 @@ namespace MWRender
this->mutex.unlock (); this->mutex.unlock ();
} }
double get_audio_clock(VideoState *is) { double get_audio_clock(VideoState *is)
double pts; {
return is->AudioTrack->getTimeOffset();
}
pts = is->audio_clock; /* maintained in the audio thread */ double get_video_clock(VideoState *is)
if(is->audio_st) { {
int n = is->audio_st->codec->channels * 2;
int bytes_per_sec = is->audio_st->codec->sample_rate * n;
int hw_buf_size = is->audio_buf_size - is->audio_buf_index;
pts -= (double)hw_buf_size / bytes_per_sec;
}
return pts;
}
double get_video_clock(VideoState *is) {
double delta; double delta;
delta = (av_gettime() - is->video_current_pts_time) / 1000000.0; delta = (av_gettime() - is->video_current_pts_time) / 1000000.0;
@ -173,50 +168,67 @@ namespace MWRender
return get_external_clock(is); return get_external_clock(is);
} }
} }
class MovieAudioDecoder : public MWSound::Sound_Decoder
{
static void fail(const std::string &str)
{
throw std::runtime_error(str);
}
VideoState *is;
/* Add or subtract samples to get a better sync, return new /* Add or subtract samples to get a better sync, return new
audio buffer size */ * audio buffer size */
int synchronize_audio(VideoState *is, short *samples, int synchronize_audio(uint8_t *samples, int samples_size, double pts)
int samples_size, double pts) { {
int n; if(is->av_sync_type == AV_SYNC_AUDIO_MASTER)
double ref_clock; return samples_size;
double diff, avg_diff, ref_clock;
int wanted_size, min_size, max_size, n;
// int nb_samples;
n = 2 * is->audio_st->codec->channels; n = 2 * is->audio_st->codec->channels;
if(is->av_sync_type != AV_SYNC_AUDIO_MASTER) {
double diff, avg_diff;
int wanted_size, min_size, max_size;
// int nb_samples;
ref_clock = get_master_clock(is); ref_clock = get_master_clock(is);
diff = get_audio_clock(is) - ref_clock; diff = get_audio_clock(is) - ref_clock;
if(diff < AV_NOSYNC_THRESHOLD) { if(diff < AV_NOSYNC_THRESHOLD)
{
// accumulate the diffs // accumulate the diffs
is->audio_diff_cum = diff + is->audio_diff_avg_coef * is->audio_diff_cum = diff + is->audio_diff_avg_coef *
is->audio_diff_cum; is->audio_diff_cum;
if(is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB) { if(is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB)
is->audio_diff_avg_count++; is->audio_diff_avg_count++;
} else { else
{
avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef); avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef);
if(fabs(avg_diff) >= is->audio_diff_threshold) { if(fabs(avg_diff) >= is->audio_diff_threshold)
{
wanted_size = samples_size + ((int)(diff * is->audio_st->codec->sample_rate) * n); wanted_size = samples_size + ((int)(diff * is->audio_st->codec->sample_rate) * n);
min_size = samples_size * ((100 - SAMPLE_CORRECTION_PERCENT_MAX) / 100); min_size = samples_size * ((100 - SAMPLE_CORRECTION_PERCENT_MAX) / 100);
max_size = samples_size * ((100 + SAMPLE_CORRECTION_PERCENT_MAX) / 100); max_size = samples_size * ((100 + SAMPLE_CORRECTION_PERCENT_MAX) / 100);
if(wanted_size < min_size) {
if(wanted_size < min_size)
wanted_size = min_size; wanted_size = min_size;
} else if (wanted_size > max_size) { else if (wanted_size > max_size)
wanted_size = max_size; wanted_size = max_size;
}
if(wanted_size < samples_size) { if(wanted_size < samples_size)
{
/* remove samples */ /* remove samples */
samples_size = wanted_size; samples_size = wanted_size;
} else if(wanted_size > samples_size) { }
else if(wanted_size > samples_size)
{
uint8_t *samples_end, *q; uint8_t *samples_end, *q;
int nb; int nb;
/* add samples by copying final sample*/ /* add samples by copying final sample*/
nb = (samples_size - wanted_size); nb = (samples_size - wanted_size);
samples_end = (uint8_t *)samples + samples_size - n; samples_end = samples + samples_size - n;
q = samples_end + n; q = samples_end + n;
while(nb > 0) { while(nb > 0)
{
memcpy(q, samples_end, n); memcpy(q, samples_end, n);
q += n; q += n;
nb -= n; nb -= n;
@ -225,34 +237,41 @@ namespace MWRender
} }
} }
} }
} else { }
else
{
/* difference is TOO big; reset diff stuff */ /* difference is TOO big; reset diff stuff */
is->audio_diff_avg_count = 0; is->audio_diff_avg_count = 0;
is->audio_diff_cum = 0; is->audio_diff_cum = 0;
} }
}
return samples_size; return samples_size;
} }
int audio_decode_frame(VideoState *is, uint8_t *audio_buf, int buf_size, double *pts_ptr) {
int len1, data_size, n; int audio_decode_frame(uint8_t *audio_buf, int buf_size, double *pts_ptr)
{
AVPacket *pkt = &is->audio_pkt; AVPacket *pkt = &is->audio_pkt;
int len1, data_size, n;
double pts; double pts;
for(;;) { for(;;)
while(is->audio_pkt_size > 0) { {
while(is->audio_pkt_size > 0)
{
data_size = buf_size; data_size = buf_size;
len1 = avcodec_decode_audio3(is->audio_st->codec, len1 = avcodec_decode_audio3(is->audio_st->codec,
(int16_t*)audio_buf, &data_size, pkt); (int16_t*)audio_buf, &data_size, pkt);
if(len1 < 0)
{
if(len1 < 0) {
/* if error, skip frame */ /* if error, skip frame */
is->audio_pkt_size = 0; is->audio_pkt_size = 0;
break; break;
} }
is->audio_pkt_data += len1; is->audio_pkt_data += len1;
is->audio_pkt_size -= len1; is->audio_pkt_size -= len1;
if(data_size <= 0) { if(data_size <= 0)
{
/* No data yet, get more frames */ /* No data yet, get more frames */
continue; continue;
} }
@ -268,52 +287,111 @@ namespace MWRender
if(pkt->data) if(pkt->data)
av_free_packet(pkt); av_free_packet(pkt);
if(is->quit) { if(is->quit)
return -1; return -1;
}
/* next packet */ /* next packet */
if(packet_queue_get(&is->audioq, pkt, 1) < 0) { if(packet_queue_get(&is->audioq, pkt, 1) < 0)
return -1; return -1;
}
is->audio_pkt_data = pkt->data; is->audio_pkt_data = pkt->data;
is->audio_pkt_size = pkt->size; is->audio_pkt_size = pkt->size;
/* if update, update the audio clock w/pts */ /* if update, update the audio clock w/pts */
if((uint64_t)pkt->pts != AV_NOPTS_VALUE) { if((uint64_t)pkt->pts != AV_NOPTS_VALUE)
is->audio_clock = av_q2d(is->audio_st->time_base)*pkt->pts; is->audio_clock = av_q2d(is->audio_st->time_base)*pkt->pts;
} }
} }
void open(const std::string&)
{ fail(std::string("Invalid call to ")+__PRETTY_FUNCTION__); }
void close() { }
std::string getName()
{ return is->stream->getName(); }
void rewind() { }
public:
MovieAudioDecoder(VideoState *_is) : is(_is) { }
void getInfo(int *samplerate, MWSound::ChannelConfig *chans, MWSound::SampleType * type)
{
if(is->audio_st->codec->sample_fmt == AV_SAMPLE_FMT_U8)
*type = MWSound::SampleType_UInt8;
else if(is->audio_st->codec->sample_fmt == AV_SAMPLE_FMT_S16)
*type = MWSound::SampleType_Int16;
else
fail(std::string("Unsupported sample format: ")+
av_get_sample_fmt_name(is->audio_st->codec->sample_fmt));
if(is->audio_st->codec->channel_layout == AV_CH_LAYOUT_MONO)
*chans = MWSound::ChannelConfig_Mono;
else if(is->audio_st->codec->channel_layout == AV_CH_LAYOUT_STEREO)
*chans = MWSound::ChannelConfig_Stereo;
else if(is->audio_st->codec->channel_layout == 0)
{
/* Unknown channel layout. Try to guess. */
if(is->audio_st->codec->channels == 1)
*chans = MWSound::ChannelConfig_Mono;
else if(is->audio_st->codec->channels == 2)
*chans = MWSound::ChannelConfig_Stereo;
else
{
std::stringstream sstr("Unsupported raw channel count: ");
sstr << is->audio_st->codec->channels;
fail(sstr.str());
}
}
else
{
char str[1024];
av_get_channel_layout_string(str, sizeof(str), is->audio_st->codec->channels,
is->audio_st->codec->channel_layout);
fail(std::string("Unsupported channel layout: ")+str);
} }
void audio_callback(void *userdata, Uint8 *stream, int len) { *samplerate = is->audio_st->codec->sample_rate;
VideoState *is = (VideoState *)userdata; }
int len1, audio_size;
size_t read(char *stream, size_t len)
{
size_t total = 0;
while(total < len)
{
if(is->audio_buf_index >= is->audio_buf_size)
{
int audio_size;
double pts; double pts;
while(len > 0) {
if(is->audio_buf_index >= is->audio_buf_size) {
/* We have already sent all our data; get more */ /* We have already sent all our data; get more */
audio_size = audio_decode_frame(is, is->audio_buf, sizeof(is->audio_buf), &pts); audio_size = audio_decode_frame(is->audio_buf, sizeof(is->audio_buf), &pts);
if(audio_size < 0) { if(audio_size < 0)
/* If error, output silence */ {
is->audio_buf_size = 1024; /* If error, we're done */
memset(is->audio_buf, 0, is->audio_buf_size); break;
} else {
audio_size = synchronize_audio(is, (int16_t *)is->audio_buf,
audio_size, pts);
is->audio_buf_size = audio_size;
} }
audio_size = synchronize_audio(is->audio_buf, audio_size, pts);
is->audio_buf_size = audio_size;
is->audio_buf_index = 0; is->audio_buf_index = 0;
} }
len1 = is->audio_buf_size - is->audio_buf_index;
if(len1 > len) size_t len1 = std::min(is->audio_buf_size - is->audio_buf_index,
len1 = len; len - total);
memcpy(stream, (uint8_t*)is->audio_buf + is->audio_buf_index, len1); memcpy(stream, (uint8_t*)is->audio_buf + is->audio_buf_index, len1);
len -= len1;
total += len1;
stream += len1; stream += len1;
is->audio_buf_index += len1; is->audio_buf_index += len1;
} }
return total;
} }
};
/* /*
static Uint32 sdl_refresh_timer_cb(Uint32 interval, void *opaque) { static Uint32 sdl_refresh_timer_cb(Uint32 interval, void *opaque) {
SDL_Event event; SDL_Event event;
@ -371,8 +449,8 @@ namespace MWRender
} }
void video_refresh_timer(void *userdata) { void video_refresh_timer(void *userdata)
{
VideoState *is = (VideoState *)userdata; VideoState *is = (VideoState *)userdata;
VideoPicture *vp; VideoPicture *vp;
double actual_delay, delay, sync_threshold, ref_clock, diff; double actual_delay, delay, sync_threshold, ref_clock, diff;
@ -439,8 +517,8 @@ namespace MWRender
} }
} }
int queue_picture(VideoState *is, AVFrame *pFrame, double pts) { int queue_picture(VideoState *is, AVFrame *pFrame, double pts)
{
VideoPicture *vp; VideoPicture *vp;
/* wait until we have a new pic */ /* wait until we have a new pic */
@ -487,8 +565,8 @@ namespace MWRender
return 0; return 0;
} }
double synchronize_video(VideoState *is, AVFrame *src_frame, double pts) { double synchronize_video(VideoState *is, AVFrame *src_frame, double pts)
{
double frame_delay; double frame_delay;
if(pts != 0) { if(pts != 0) {
@ -512,14 +590,16 @@ namespace MWRender
* buffer. We use this to store the global_pts in * buffer. We use this to store the global_pts in
* a frame at the time it is allocated. * a frame at the time it is allocated.
*/ */
int our_get_buffer(struct AVCodecContext *c, AVFrame *pic) { int our_get_buffer(struct AVCodecContext *c, AVFrame *pic)
{
int ret = avcodec_default_get_buffer(c, pic); int ret = avcodec_default_get_buffer(c, pic);
uint64_t *pts = (uint64_t*)av_malloc(sizeof(uint64_t)); uint64_t *pts = (uint64_t*)av_malloc(sizeof(uint64_t));
*pts = global_video_pkt_pts; *pts = global_video_pkt_pts;
pic->opaque = pts; pic->opaque = pts;
return ret; return ret;
} }
void our_release_buffer(struct AVCodecContext *c, AVFrame *pic) { void our_release_buffer(struct AVCodecContext *c, AVFrame *pic)
{
if(pic) av_freep(&pic->opaque); if(pic) av_freep(&pic->opaque);
avcodec_default_release_buffer(c, pic); avcodec_default_release_buffer(c, pic);
} }
@ -583,9 +663,9 @@ namespace MWRender
int stream_component_open(VideoState *is, int stream_index, AVFormatContext *pFormatCtx) int stream_component_open(VideoState *is, int stream_index, AVFormatContext *pFormatCtx)
{ {
MWSound::DecoderPtr decoder;
AVCodecContext *codecCtx; AVCodecContext *codecCtx;
AVCodec *codec; AVCodec *codec;
SDL_AudioSpec wanted_spec, spec;
if(stream_index < 0 || stream_index >= static_cast<int>(pFormatCtx->nb_streams)) { if(stream_index < 0 || stream_index >= static_cast<int>(pFormatCtx->nb_streams)) {
return -1; return -1;
@ -594,22 +674,9 @@ namespace MWRender
// Get a pointer to the codec context for the video stream // Get a pointer to the codec context for the video stream
codecCtx = pFormatCtx->streams[stream_index]->codec; codecCtx = pFormatCtx->streams[stream_index]->codec;
if(codecCtx->codec_type == AVMEDIA_TYPE_AUDIO) { if(codecCtx->codec_type == AVMEDIA_TYPE_AUDIO)
// Set audio settings from codec info
wanted_spec.freq = codecCtx->sample_rate;
wanted_spec.format = AUDIO_S16SYS;
wanted_spec.channels = codecCtx->channels;
wanted_spec.silence = 0;
wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
wanted_spec.callback = audio_callback;
wanted_spec.userdata = is;
if(SDL_OpenAudio(&wanted_spec, &spec) < 0) {
fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError());
return -1; return -1;
}
is->audio_hw_buf_size = spec.size;
}
codec = avcodec_find_decoder(codecCtx->codec_id); codec = avcodec_find_decoder(codecCtx->codec_id);
if(!codec || (avcodec_open2(codecCtx, codec, NULL) < 0)) { if(!codec || (avcodec_open2(codecCtx, codec, NULL) < 0)) {
fprintf(stderr, "Unsupported codec!\n"); fprintf(stderr, "Unsupported codec!\n");
@ -627,11 +694,13 @@ namespace MWRender
is->audio_diff_avg_coef = exp(log(0.01 / AUDIO_DIFF_AVG_NB)); is->audio_diff_avg_coef = exp(log(0.01 / AUDIO_DIFF_AVG_NB));
is->audio_diff_avg_count = 0; is->audio_diff_avg_count = 0;
/* Correct audio only if larger error than this */ /* Correct audio only if larger error than this */
is->audio_diff_threshold = 2.0 * SDL_AUDIO_BUFFER_SIZE / codecCtx->sample_rate; is->audio_diff_threshold = 2.0 * 0.1/* 100 ms */;
memset(&is->audio_pkt, 0, sizeof(is->audio_pkt)); memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
packet_queue_init(&is->audioq); packet_queue_init(&is->audioq);
SDL_PauseAudio(0);
decoder.reset(new MovieAudioDecoder(is));
is->AudioTrack = MWBase::Environment::get().getSoundManager()->playTrack(decoder);
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
is->videoStream = stream_index; is->videoStream = stream_index;
@ -841,17 +910,13 @@ namespace MWRender
} }
mSceneMgr->setSpecialCaseRenderQueueMode(Ogre::SceneManager::SCRQM_EXCLUDE); mSceneMgr->setSpecialCaseRenderQueueMode(Ogre::SceneManager::SCRQM_EXCLUDE);
MWBase::Environment::get().getSoundManager()->pauseAllSounds();
mState = new VideoState; mState = new VideoState;
// Register all formats and codecs // Register all formats and codecs
av_register_all(); av_register_all();
MWBase::Environment::get().getSoundManager()->pauseAllSounds();
if(SDL_Init(SDL_INIT_AUDIO)) {
throw std::runtime_error("Failed to initialize SDL");
}
mState->refresh = 0; mState->refresh = 0;
mState->resourceName = resourceName; mState->resourceName = resourceName;
@ -869,9 +934,7 @@ namespace MWRender
mState->refresh--; mState->refresh--;
} }
if (mState && mState->quit) if (mState && mState->quit)
{
close(); close();
}
if (mState && mState->display_ready && !Ogre::TextureManager::getSingleton ().getByName ("VideoTexture").isNull ()) if (mState && mState->display_ready && !Ogre::TextureManager::getSingleton ().getByName ("VideoTexture").isNull ())
mVideoMaterial->getTechnique(0)->getPass(0)->getTextureUnitState (0)->setTextureName ("VideoTexture"); mVideoMaterial->getTechnique(0)->getPass(0)->getTextureUnitState (0)->setTextureName ("VideoTexture");
@ -888,7 +951,6 @@ namespace MWRender
delete mState; delete mState;
mState = NULL; mState = NULL;
SDL_CloseAudio();
MWBase::Environment::get().getSoundManager()->resumeAllSounds(); MWBase::Environment::get().getSoundManager()->resumeAllSounds();
mRectangle->setVisible (false); mRectangle->setVisible (false);

17
apps/openmw/mwrender/videoplayer.hpp
View file

@ -16,13 +16,11 @@ extern "C"
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
} }
#include <SDL/SDL.h>
#include <SDL/SDL_thread.h>
#include <cstdio> #include <cstdio>
#include <cmath> #include <cmath>
#define SDL_AUDIO_BUFFER_SIZE 1024 #include "../mwbase/soundmanager.hpp"
#define MAX_AUDIOQ_SIZE (5 * 16 * 1024) #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)
#define MAX_VIDEOQ_SIZE (5 * 256 * 1024) #define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
#define AV_SYNC_THRESHOLD 0.01 #define AV_SYNC_THRESHOLD 0.01
@ -33,11 +31,8 @@ extern "C"
#define DEFAULT_AV_SYNC_TYPE AV_SYNC_VIDEO_MASTER #define DEFAULT_AV_SYNC_TYPE AV_SYNC_VIDEO_MASTER
namespace MWRender namespace MWRender
{ {
struct PacketQueue { struct PacketQueue {
PacketQueue () : PacketQueue () :
first_pkt(NULL), last_pkt(NULL), nb_packets(0), size(0) first_pkt(NULL), last_pkt(NULL), nb_packets(0), size(0)
@ -64,7 +59,7 @@ namespace MWRender
VideoState () : VideoState () :
videoStream(-1), audioStream(-1), av_sync_type(0), external_clock(0), videoStream(-1), audioStream(-1), av_sync_type(0), external_clock(0),
external_clock_time(0), audio_clock(0), audio_st(NULL), audio_buf_size(0), external_clock_time(0), audio_clock(0), audio_st(NULL), audio_buf_size(0),
audio_pkt_data(NULL), audio_pkt_size(0), audio_hw_buf_size(0), audio_diff_cum(0), audio_diff_avg_coef(0), audio_pkt_data(NULL), audio_pkt_size(0), audio_diff_cum(0), audio_diff_avg_coef(0),
audio_diff_threshold(0), audio_diff_avg_count(0), frame_timer(0), frame_last_pts(0), frame_last_delay(0), audio_diff_threshold(0), audio_diff_avg_count(0), frame_timer(0), frame_last_pts(0), frame_last_delay(0),
video_clock(0), video_current_pts(0), video_current_pts_time(0), video_st(NULL), rgbaFrame(NULL), pictq_size(0), video_clock(0), video_current_pts(0), video_current_pts_time(0), video_st(NULL), rgbaFrame(NULL), pictq_size(0),
pictq_rindex(0), pictq_windex(0), quit(false), refresh(0), sws_context(NULL), display_ready(0) pictq_rindex(0), pictq_windex(0), quit(false), refresh(0), sws_context(NULL), display_ready(0)
@ -85,6 +80,7 @@ namespace MWRender
int av_sync_type; int av_sync_type;
double external_clock; /* external clock base */ double external_clock; /* external clock base */
int64_t external_clock_time; int64_t external_clock_time;
double audio_clock; double audio_clock;
AVStream *audio_st; AVStream *audio_st;
PacketQueue audioq; PacketQueue audioq;
@ -94,11 +90,11 @@ namespace MWRender
AVPacket audio_pkt; AVPacket audio_pkt;
uint8_t *audio_pkt_data; uint8_t *audio_pkt_data;
int audio_pkt_size; int audio_pkt_size;
int audio_hw_buf_size;
double audio_diff_cum; /* used for AV difference average computation */ double audio_diff_cum; /* used for AV difference average computation */
double audio_diff_avg_coef; double audio_diff_avg_coef;
double audio_diff_threshold; double audio_diff_threshold;
int audio_diff_avg_count; int audio_diff_avg_count;
double frame_timer; double frame_timer;
double frame_last_pts; double frame_last_pts;
double frame_last_delay; double frame_last_delay;
@ -110,6 +106,8 @@ namespace MWRender
Ogre::DataStreamPtr stream; Ogre::DataStreamPtr stream;
MWBase::SoundPtr AudioTrack;
SwsContext* sws_context; SwsContext* sws_context;
VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE]; VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
@ -157,7 +155,6 @@ namespace MWRender
Ogre::SceneManager* mSceneMgr; Ogre::SceneManager* mSceneMgr;
Ogre::Rectangle2D* mRectangle; Ogre::Rectangle2D* mRectangle;
Ogre::MaterialPtr mVideoMaterial; Ogre::MaterialPtr mVideoMaterial;
}; };
} }