New upstream version 26.0.0+dfsg1
This commit is contained in:
Sebastian Ramacher
parent
8e020cdacb
commit
240080891f
837 changed files with 41275 additions and 9196 deletions
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include <libavcodec/avcodec.h>
|
||||
#include <libavformat/avformat.h>
|
||||
#include <libavutil/imgutils.h>
|
||||
#include <libswscale/swscale.h>
|
||||
|
||||
#include "../obs-ffmpeg-compat.h"
|
||||
|
|
@ -10,9 +11,6 @@ struct ffmpeg_image {
|
|||
const char *file;
|
||||
AVFormatContext *fmt_ctx;
|
||||
AVCodecContext *decoder_ctx;
|
||||
AVCodec *decoder;
|
||||
AVStream *stream;
|
||||
int stream_idx;
|
||||
|
||||
int cx, cy;
|
||||
enum AVPixelFormat format;
|
||||
|
|
@ -20,26 +18,46 @@ struct ffmpeg_image {
|
|||
|
||||
static bool ffmpeg_image_open_decoder_context(struct ffmpeg_image *info)
|
||||
{
|
||||
int ret = av_find_best_stream(info->fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, 1,
|
||||
NULL, 0);
|
||||
AVFormatContext *const fmt_ctx = info->fmt_ctx;
|
||||
int ret = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, 1, NULL,
|
||||
0);
|
||||
if (ret < 0) {
|
||||
blog(LOG_WARNING, "Couldn't find video stream in file '%s': %s",
|
||||
info->file, av_err2str(ret));
|
||||
return false;
|
||||
}
|
||||
|
||||
info->stream_idx = ret;
|
||||
info->stream = info->fmt_ctx->streams[ret];
|
||||
info->decoder_ctx = info->stream->codec;
|
||||
info->decoder = avcodec_find_decoder(info->decoder_ctx->codec_id);
|
||||
|
||||
if (!info->decoder) {
|
||||
AVStream *const stream = fmt_ctx->streams[ret];
|
||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
|
||||
AVCodecParameters *const codecpar = stream->codecpar;
|
||||
AVCodec *const decoder = avcodec_find_decoder(codecpar->codec_id);
|
||||
#else
|
||||
AVCodecContext *const decoder_ctx = stream->codec;
|
||||
AVCodec *const decoder = avcodec_find_decoder(decoder_ctx->codec_id);
|
||||
#endif
|
||||
if (!decoder) {
|
||||
blog(LOG_WARNING, "Failed to find decoder for file '%s'",
|
||||
info->file);
|
||||
return false;
|
||||
}
|
||||
|
||||
ret = avcodec_open2(info->decoder_ctx, info->decoder, NULL);
|
||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
|
||||
AVCodecContext *const decoder_ctx = avcodec_alloc_context3(decoder);
|
||||
avcodec_parameters_to_context(decoder_ctx, codecpar);
|
||||
#endif
|
||||
|
||||
info->decoder_ctx = decoder_ctx;
|
||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
|
||||
info->cx = codecpar->width;
|
||||
info->cy = codecpar->height;
|
||||
info->format = codecpar->format;
|
||||
#else
|
||||
info->cx = decoder_ctx->width;
|
||||
info->cy = decoder_ctx->height;
|
||||
info->format = decoder_ctx->pix_fmt;
|
||||
#endif
|
||||
|
||||
ret = avcodec_open2(decoder_ctx, decoder, NULL);
|
||||
if (ret < 0) {
|
||||
blog(LOG_WARNING,
|
||||
"Failed to open video codec for file '%s': "
|
||||
|
|
@ -53,7 +71,11 @@ static bool ffmpeg_image_open_decoder_context(struct ffmpeg_image *info)
|
|||
|
||||
static void ffmpeg_image_free(struct ffmpeg_image *info)
|
||||
{
|
||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
|
||||
avcodec_free_context(&info->decoder_ctx);
|
||||
#else
|
||||
avcodec_close(info->decoder_ctx);
|
||||
#endif
|
||||
avformat_close_input(&info->fmt_ctx);
|
||||
}
|
||||
|
||||
|
|
@ -66,7 +88,6 @@ static bool ffmpeg_image_init(struct ffmpeg_image *info, const char *file)
|
|||
|
||||
memset(info, 0, sizeof(struct ffmpeg_image));
|
||||
info->file = file;
|
||||
info->stream_idx = -1;
|
||||
|
||||
ret = avformat_open_input(&info->fmt_ctx, file, NULL, NULL);
|
||||
if (ret < 0) {
|
||||
|
|
@ -87,9 +108,6 @@ static bool ffmpeg_image_init(struct ffmpeg_image *info, const char *file)
|
|||
if (!ffmpeg_image_open_decoder_context(info))
|
||||
goto fail;
|
||||
|
||||
info->cx = info->decoder_ctx->width;
|
||||
info->cy = info->decoder_ctx->height;
|
||||
info->format = info->decoder_ctx->pix_fmt;
|
||||
return true;
|
||||
|
||||
fail:
|
||||
|
|
@ -122,9 +140,11 @@ static bool ffmpeg_image_reformat_frame(struct ffmpeg_image *info,
|
|||
}
|
||||
|
||||
} else {
|
||||
static const enum AVPixelFormat format = AV_PIX_FMT_BGRA;
|
||||
|
||||
sws_ctx = sws_getContext(info->cx, info->cy, info->format,
|
||||
info->cx, info->cy, AV_PIX_FMT_BGRA,
|
||||
SWS_POINT, NULL, NULL, NULL);
|
||||
info->cx, info->cy, format, SWS_POINT,
|
||||
NULL, NULL, NULL);
|
||||
if (!sws_ctx) {
|
||||
blog(LOG_WARNING,
|
||||
"Failed to create scale context "
|
||||
|
|
@ -133,17 +153,36 @@ static bool ffmpeg_image_reformat_frame(struct ffmpeg_image *info,
|
|||
return false;
|
||||
}
|
||||
|
||||
uint8_t *pointers[4];
|
||||
int linesizes[4];
|
||||
ret = av_image_alloc(pointers, linesizes, info->cx, info->cy,
|
||||
format, 32);
|
||||
if (ret < 0) {
|
||||
blog(LOG_WARNING, "av_image_alloc failed for '%s': %s",
|
||||
info->file, av_err2str(ret));
|
||||
sws_freeContext(sws_ctx);
|
||||
return false;
|
||||
}
|
||||
|
||||
ret = sws_scale(sws_ctx, (const uint8_t *const *)frame->data,
|
||||
frame->linesize, 0, info->cy, &out, &linesize);
|
||||
frame->linesize, 0, info->cy, pointers,
|
||||
linesizes);
|
||||
sws_freeContext(sws_ctx);
|
||||
|
||||
if (ret < 0) {
|
||||
blog(LOG_WARNING, "sws_scale failed for '%s': %s",
|
||||
info->file, av_err2str(ret));
|
||||
av_freep(pointers);
|
||||
return false;
|
||||
}
|
||||
|
||||
info->format = AV_PIX_FMT_BGRA;
|
||||
for (size_t y = 0; y < (size_t)info->cy; y++)
|
||||
memcpy(out + y * linesize,
|
||||
pointers[0] + y * linesizes[0], linesize);
|
||||
|
||||
av_freep(pointers);
|
||||
|
||||
info->format = format;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -1143,33 +1143,38 @@ void gs_texture_set_image(gs_texture_t *tex, const uint8_t *data,
|
|||
{
|
||||
uint8_t *ptr;
|
||||
uint32_t linesize_out;
|
||||
uint32_t row_copy;
|
||||
int32_t height;
|
||||
int32_t y;
|
||||
size_t row_copy;
|
||||
size_t height;
|
||||
|
||||
if (!gs_valid_p2("gs_texture_set_image", tex, data))
|
||||
return;
|
||||
|
||||
height = (int32_t)gs_texture_get_height(tex);
|
||||
|
||||
if (!gs_texture_map(tex, &ptr, &linesize_out))
|
||||
return;
|
||||
|
||||
row_copy = (linesize < linesize_out) ? linesize : linesize_out;
|
||||
|
||||
height = gs_texture_get_height(tex);
|
||||
|
||||
if (flip) {
|
||||
for (y = height - 1; y >= 0; y--)
|
||||
memcpy(ptr + (uint32_t)y * linesize_out,
|
||||
data + (uint32_t)(height - y - 1) * linesize,
|
||||
row_copy);
|
||||
uint8_t *const end = ptr + height * linesize_out;
|
||||
data += (height - 1) * linesize;
|
||||
while (ptr < end) {
|
||||
memcpy(ptr, data, row_copy);
|
||||
ptr += linesize_out;
|
||||
data -= linesize;
|
||||
}
|
||||
|
||||
} else if (linesize == linesize_out) {
|
||||
memcpy(ptr, data, row_copy * height);
|
||||
|
||||
} else {
|
||||
for (y = 0; y < height; y++)
|
||||
memcpy(ptr + (uint32_t)y * linesize_out,
|
||||
data + (uint32_t)y * linesize, row_copy);
|
||||
uint8_t *const end = ptr + height * linesize_out;
|
||||
while (ptr < end) {
|
||||
memcpy(ptr, data, row_copy);
|
||||
ptr += linesize_out;
|
||||
data += linesize;
|
||||
}
|
||||
}
|
||||
|
||||
gs_texture_unmap(tex);
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ float calc_torquef(float val1, float val2, float torque, float min_adjust,
|
|||
bool over;
|
||||
|
||||
if (close_float(val1, val2, EPSILON))
|
||||
return val1;
|
||||
return val2;
|
||||
|
||||
dist = (val2 - val1) * torque;
|
||||
over = dist > 0.0f;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue