ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fixes for linking libav in windows.

This commit is contained in:
mjbudd77 2021-09-14 00:56:59 -04:00
parent 233d555ffe
commit 2007d03eef
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@ -36,6 +36,13 @@ if(WIN32)
set( SDL2_LDFLAGS ${SDL_INSTALL_PREFIX}/SDL2/lib/x64/SDL2.lib ) set( SDL2_LDFLAGS ${SDL_INSTALL_PREFIX}/SDL2/lib/x64/SDL2.lib )
set( SYS_LIBS wsock32 ws2_32 vfw32 Htmlhelp ) set( SYS_LIBS wsock32 ws2_32 vfw32 Htmlhelp )
set(APP_ICON_RESOURCES_WINDOWS ${CMAKE_SOURCE_DIR}/icons/fceux.rc ) set(APP_ICON_RESOURCES_WINDOWS ${CMAKE_SOURCE_DIR}/icons/fceux.rc )
add_definitions( -D_USE_LIBAV ${LIBAV_CFLAGS} )
include_directories( ${FFMPEG_INSTALL_PREFIX}/FFmpeg )
set( LIBAV_LDFLAGS ${FFMPEG_INSTALL_PREFIX}/FFmpeg/libavcodec/avcodec.lib
${FFMPEG_INSTALL_PREFIX}/FFmpeg/libavformat/avformat.lib
${FFMPEG_INSTALL_PREFIX}/FFmpeg/libavutil/avutil.lib
${FFMPEG_INSTALL_PREFIX}/FFmpeg/libswscale/swscale.lib
${FFMPEG_INSTALL_PREFIX}/FFmpeg/libswresample/swresample.lib )
else(WIN32) else(WIN32)
# Non Windows System # Non Windows System
# UNIX (Linux or Mac OSX) # UNIX (Linux or Mac OSX)

17
src/drivers/Qt/AviRecord.cpp
View File

@ -49,6 +49,7 @@ extern "C"
{ {
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavcodec/avcodec.h"
//#include "libavresample/avresample.h" //#include "libavresample/avresample.h"
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
#include "libswresample/swresample.h" #include "libswresample/swresample.h"
@ -809,7 +810,7 @@ static AVFrame *alloc_picture(enum AVPixelFormat pix_fmt, int width, int height)
static int initVideoStream( enum AVCodecID codec_id, OutputStream *ost ) static int initVideoStream( enum AVCodecID codec_id, OutputStream *ost )
{ {
int ret; int ret;
AVCodec *codec; const AVCodec *codec;
AVCodecContext *c; AVCodecContext *c;
double fps; double fps;
int fps1000; int fps1000;
@ -857,7 +858,9 @@ static int initVideoStream( enum AVCodecID codec_id, OutputStream *ost )
* of which frame timestamps are represented. For fixed-fps content, * of which frame timestamps are represented. For fixed-fps content,
* timebase should be 1/framerate and timestamp increments should be * timebase should be 1/framerate and timestamp increments should be
* identical to 1. */ * identical to 1. */
ost->st->time_base = (AVRational){ 1000, fps1000 }; //ost->st->time_base = (AVRational){ 1000, fps1000 };
ost->st->time_base.num = 1000;
ost->st->time_base.den = fps1000;
c->time_base = ost->st->time_base; c->time_base = ost->st->time_base;
c->gop_size = 12; /* emit one intra frame every twelve frames at most */ c->gop_size = 12; /* emit one intra frame every twelve frames at most */
c->pix_fmt = AV_PIX_FMT_YUV420P; c->pix_fmt = AV_PIX_FMT_YUV420P;
@ -987,7 +990,7 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
static int initAudioStream( enum AVCodecID codec_id, OutputStream *ost ) static int initAudioStream( enum AVCodecID codec_id, OutputStream *ost )
{ {
int ret, nb_samples; int ret, nb_samples;
AVCodec *codec; const AVCodec *codec;
AVCodecContext *c; AVCodecContext *c;
/* find the audio encoder */ /* find the audio encoder */
@ -1022,7 +1025,9 @@ static int initAudioStream( enum AVCodecID codec_id, OutputStream *ost )
c->channel_layout = codec->channel_layouts ? codec->channel_layouts[0] : AV_CH_LAYOUT_STEREO; c->channel_layout = codec->channel_layouts ? codec->channel_layouts[0] : AV_CH_LAYOUT_STEREO;
c->channels = av_get_channel_layout_nb_channels(c->channel_layout); c->channels = av_get_channel_layout_nb_channels(c->channel_layout);
c->bit_rate = 64000; c->bit_rate = 64000;
ost->st->time_base = (AVRational){ 1, c->sample_rate }; //ost->st->time_base = (AVRational){ 1, c->sample_rate };
ost->st->time_base.num = 1;
ost->st->time_base.den = c->sample_rate;
// some formats want stream headers to be separate // some formats want stream headers to be separate
if (oc->oformat->flags & AVFMT_GLOBALHEADER) if (oc->oformat->flags & AVFMT_GLOBALHEADER)
{ {
@ -1109,7 +1114,7 @@ static void print_Codecs(void)
static int initMedia( const char *filename ) static int initMedia( const char *filename )
{ {
AVOutputFormat *fmt; const AVOutputFormat *fmt;
/* Initialize libavcodec, and register all codecs and formats. */ /* Initialize libavcodec, and register all codecs and formats. */
//av_register_all(); //av_register_all();
@ -1248,6 +1253,8 @@ static int encode_audio_frame( int16_t *audioOut, int numSamples)
} }
} }
frame->nb_samples = numSamples; frame->nb_samples = numSamples;
printf("numSamples: %i\n", numSamples);
} }
ret = av_frame_make_writable(ost->frame); ret = av_frame_make_writable(ost->frame);