lifegpc/eh-downloader
1
0
Fork 0
mirror of https://github.com/lifegpc/eh-downloader.git synced 2026-06-06 05:38:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning

Browse Source 
Skip overwrite
This commit is contained in:
lifegpc
2024-06-08 15:24:03 +08:00
parent 71c831133f
commit 3018c3cbe6
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/thumbnail/thumbnail.c
View File

@@ -2,6 +2,7 @@
#include "cfileop.h" #include "cfileop.h"
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavutil/opt.h"
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
#include <string.h> #include <string.h>
@@ -15,6 +16,18 @@ int thumbnail_convert_frame(THUMBNAIL_ERROR* err, AVFrame* ifr, AVFrame** ofr, A
int re = 0; int re = 0;
struct SwsContext* sws = NULL; struct SwsContext* sws = NULL;
AVFrame* fr = NULL, * fr2 = NULL; AVFrame* fr = NULL, * fr2 = NULL;
enum AVPixelFormat fmt = (enum AVPixelFormat)ifr->format;
if (fmt == AV_PIX_FMT_YUVJ411P) {
fmt = AV_PIX_FMT_YUV411P;
} else if (fmt == AV_PIX_FMT_YUVJ420P) {
fmt = AV_PIX_FMT_YUV420P;
} else if (fmt == AV_PIX_FMT_YUVJ422P) {
fmt = AV_PIX_FMT_YUV422P;
} else if (fmt == AV_PIX_FMT_YUVJ440P) {
fmt = AV_PIX_FMT_YUV440P;
} else if (fmt == AV_PIX_FMT_YUVJ444P) {
fmt = AV_PIX_FMT_YUV444P;
}
if (!(fr = av_frame_alloc())) { if (!(fr = av_frame_alloc())) {
err->e = THUMBNAIL_OOM; err->e = THUMBNAIL_OOM;
re = 1; re = 1;
@@ -56,7 +69,7 @@ int thumbnail_convert_frame(THUMBNAIL_ERROR* err, AVFrame* ifr, AVFrame** ofr, A
av_log(NULL, AV_LOG_ERROR, "Failed to make writeable for output frame: %s\n", av_err2str(err->fferr)); av_log(NULL, AV_LOG_ERROR, "Failed to make writeable for output frame: %s\n", av_err2str(err->fferr));
goto end; goto end;
} }
if (!(sws = sws_getContext(ifr->width, ifr->height, (enum AVPixelFormat)ifr->format, fr->width, fr->height, (enum AVPixelFormat)fr->format, SWS_BILINEAR, NULL, NULL, NULL))) { if (!(sws = sws_getContext(ifr->width, ifr->height, fmt, fr->width, fr->height, (enum AVPixelFormat)fr->format, SWS_BILINEAR, NULL, NULL, NULL))) {
err->e = THUMBNAIL_UNABLE_SCALE; err->e = THUMBNAIL_UNABLE_SCALE;
re = 1; re = 1;
goto end; goto end;
@@ -224,10 +237,7 @@ THUMBNAIL_ERROR gen_thumbnail(const char* src, const char* dest, int width, int
goto end; goto end;
} }
if (fileop_exists(dest)) { if (fileop_exists(dest)) {
if (!fileop_remove(dest)) { goto end;
re.e = THUMBNAIL_REMOVE_OUTPUT_FILE_FAILED;
goto end;
}
} }
if ((re.fferr = avformat_open_input(&ic, src, NULL, NULL)) < 0) { if ((re.fferr = avformat_open_input(&ic, src, NULL, NULL)) < 0) {
re.e = THUMBNAIL_FFMPEG_ERROR; re.e = THUMBNAIL_FFMPEG_ERROR;
@@ -255,6 +265,7 @@ THUMBNAIL_ERROR gen_thumbnail(const char* src, const char* dest, int width, int
re.e = THUMBNAIL_FFMPEG_ERROR; re.e = THUMBNAIL_FFMPEG_ERROR;
goto end; goto end;
} }
av_opt_set_int(oc, "update", 1, AV_OPT_SEARCH_CHILDREN);
if (!(input_codec = avcodec_find_decoder(is->codecpar->codec_id))) { if (!(input_codec = avcodec_find_decoder(is->codecpar->codec_id))) {
re.e = THUMBNAIL_NO_DECODER; re.e = THUMBNAIL_NO_DECODER;
goto end; goto end;
@@ -284,7 +295,8 @@ THUMBNAIL_ERROR gen_thumbnail(const char* src, const char* dest, int width, int
} }
occ->width = width; occ->width = width;
occ->height = height; occ->height = height;
occ->pix_fmt = AV_PIX_FMT_YUVJ420P; occ->pix_fmt = AV_PIX_FMT_YUV420P;
occ->color_range = AVCOL_RANGE_JPEG;
occ->sample_aspect_ratio = icc->sample_aspect_ratio; occ->sample_aspect_ratio = icc->sample_aspect_ratio;
occ->time_base = AV_TIME_BASE_Q; occ->time_base = AV_TIME_BASE_Q;
occ->color_range = AVCOL_RANGE_JPEG; occ->color_range = AVCOL_RANGE_JPEG;