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

FFmpeg: Backport and improve some API from medusa

This commit is contained in:
Vicki Pfau 2020-07-23 21:55:05 -07:00
parent 3f75078174
commit cdcbedc65b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/feature/ffmpeg/ffmpeg-encoder.c
View File

@ -7,6 +7,7 @@
#include <mgba/core/core.h> #include <mgba/core/core.h>
#include <mgba/gba/interface.h> #include <mgba/gba/interface.h>
#include <mgba-util/math.h>
#include <libavcodec/version.h> #include <libavcodec/version.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
@ -92,6 +93,7 @@ void FFmpegEncoderInit(struct FFmpegEncoder* encoder) {
encoder->source = NULL; encoder->source = NULL;
encoder->sink = NULL; encoder->sink = NULL;
encoder->sinkFrame = NULL; encoder->sinkFrame = NULL;
FFmpegEncoderSetInputFrameRate(encoder, VIDEO_TOTAL_LENGTH, GBA_ARM7TDMI_FREQUENCY);
int i; int i;
for (i = 0; i < FFMPEG_FILTERS_MAX; ++i) { for (i = 0; i < FFMPEG_FILTERS_MAX; ++i) {
@ -363,8 +365,8 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
encoder->video->bit_rate = encoder->videoBitrate; encoder->video->bit_rate = encoder->videoBitrate;
encoder->video->width = encoder->width; encoder->video->width = encoder->width;
encoder->video->height = encoder->height; encoder->video->height = encoder->height;
encoder->video->time_base = (AVRational) { VIDEO_TOTAL_LENGTH * encoder->frameskip, GBA_ARM7TDMI_FREQUENCY }; encoder->video->time_base = (AVRational) { encoder->frameCycles * encoder->frameskip, encoder->cycles };
encoder->video->framerate = (AVRational) { GBA_ARM7TDMI_FREQUENCY, VIDEO_TOTAL_LENGTH * encoder->frameskip }; encoder->video->framerate = (AVRational) { encoder->cycles, encoder->frameCycles * encoder->frameskip };
encoder->videoStream->time_base = encoder->video->time_base; encoder->videoStream->time_base = encoder->video->time_base;
encoder->videoStream->avg_frame_rate = encoder->video->framerate; encoder->videoStream->avg_frame_rate = encoder->video->framerate;
encoder->video->pix_fmt = encoder->pixFormat; encoder->video->pix_fmt = encoder->pixFormat;
@ -821,3 +823,12 @@ static void _ffmpegSetVideoDimensions(struct mAVStream* stream, unsigned width,
encoder->videoFrame->width, encoder->videoFrame->height, encoder->videoFrame->format, encoder->videoFrame->width, encoder->videoFrame->height, encoder->videoFrame->format,
SWS_POINT, 0, 0, 0); SWS_POINT, 0, 0, 0);
} }
void FFmpegEncoderSetInputFrameRate(struct FFmpegEncoder* encoder, int numerator, int denominator) {
reduceFraction(&numerator, &denominator);
encoder->frameCycles = numerator;
encoder->cycles = denominator;
if (encoder->video) {
encoder->video->framerate = (AVRational) { denominator, numerator * encoder->frameskip };
}
}

3
src/feature/ffmpeg/ffmpeg-encoder.h
View File

@ -78,6 +78,8 @@ struct FFmpegEncoder {
int height; int height;
int iwidth; int iwidth;
int iheight; int iheight;
int frameCycles;
int cycles;
int frameskip; int frameskip;
int skipResidue; int skipResidue;
bool loop; bool loop;
@ -97,6 +99,7 @@ bool FFmpegEncoderSetAudio(struct FFmpegEncoder*, const char* acodec, unsigned a
bool FFmpegEncoderSetVideo(struct FFmpegEncoder*, const char* vcodec, unsigned vbr, int frameskip); bool FFmpegEncoderSetVideo(struct FFmpegEncoder*, const char* vcodec, unsigned vbr, int frameskip);
bool FFmpegEncoderSetContainer(struct FFmpegEncoder*, const char* container); bool FFmpegEncoderSetContainer(struct FFmpegEncoder*, const char* container);
void FFmpegEncoderSetDimensions(struct FFmpegEncoder*, int width, int height); void FFmpegEncoderSetDimensions(struct FFmpegEncoder*, int width, int height);
void FFmpegEncoderSetInputFrameRate(struct FFmpegEncoder*, int numerator, int denominator);
void FFmpegEncoderSetLooping(struct FFmpegEncoder*, bool loop); void FFmpegEncoderSetLooping(struct FFmpegEncoder*, bool loop);
bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder*); bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder*);
bool FFmpegEncoderOpen(struct FFmpegEncoder*, const char* outfile); bool FFmpegEncoderOpen(struct FFmpegEncoder*, const char* outfile);