diff --git a/ffmpeg-app/publish.yaml b/ffmpeg-app/publish.yaml index 1808e01..6e2ceb4 100644 --- a/ffmpeg-app/publish.yaml +++ b/ffmpeg-app/publish.yaml @@ -1,6 +1,6 @@ Type: Application Name: ffmpeg-app -Version: 0.0.36 +Version: 0.1.0 Provider: - 阿里云 Description: 基于FFmpeg的音视频处理应用, 包括获取音视频元信息、获取音视频时长、音频转换、雪碧图生成、生成 GIF、打水印等多个模块。 diff --git a/ffmpeg-app/src/functions/audio_convert/index.py b/ffmpeg-app/src/functions/audio_convert/index.py index 73a6f0b..8af7e49 100644 --- a/ffmpeg-app/src/functions/audio_convert/index.py +++ b/ffmpeg-app/src/functions/audio_convert/index.py @@ -61,6 +61,10 @@ def handler(event, context): oss_client = oss2.Bucket( auth, 'oss-%s-internal.aliyuncs.com' % context.region, oss_bucket_name) + exist = oss_client.object_exists(object_key) + if not exist: + raise Exception("object {} is not exist".format(object_key)) + input_path = oss_client.sign_url('GET', object_key, 3600) fileDir, shortname, extension = get_fileNameExt(object_key) diff --git a/ffmpeg-app/src/functions/get_duration/index.py b/ffmpeg-app/src/functions/get_duration/index.py index 801d476..50920ed 100644 --- a/ffmpeg-app/src/functions/get_duration/index.py +++ b/ffmpeg-app/src/functions/get_duration/index.py @@ -45,6 +45,10 @@ def handler(event, context): oss_client = oss2.Bucket( auth, 'oss-%s-internal.aliyuncs.com' % context.region, oss_bucket_name) + exist = oss_client.object_exists(object_key) + if not exist: + raise Exception("object {} is not exist".format(object_key)) + object_url = oss_client.sign_url('GET', object_key, 15 * 60) cmd = ["ffprobe", "-show_entries", "format=duration", diff --git a/ffmpeg-app/src/functions/get_multimedia_meta/index.py b/ffmpeg-app/src/functions/get_multimedia_meta/index.py index 0af2c1d..a0a3f71 100644 --- a/ffmpeg-app/src/functions/get_multimedia_meta/index.py +++ b/ffmpeg-app/src/functions/get_multimedia_meta/index.py @@ -45,6 +45,10 @@ def handler(event, context): oss_client = oss2.Bucket( auth, 'oss-%s-internal.aliyuncs.com' % context.region, oss_bucket_name) + exist = oss_client.object_exists(object_key) + if not exist: + raise Exception("object {} is not exist".format(object_key)) + object_url = oss_client.sign_url('GET', object_key, 15 * 60) raw_result = subprocess.check_output(["ffprobe", "-v", "quiet", "-show_format", "-show_streams", diff --git a/ffmpeg-app/src/functions/get_sprites/index.py b/ffmpeg-app/src/functions/get_sprites/index.py index 8cc024d..27f4e2e 100644 --- a/ffmpeg-app/src/functions/get_sprites/index.py +++ b/ffmpeg-app/src/functions/get_sprites/index.py @@ -92,6 +92,10 @@ def handler(event, context): oss_client = oss2.Bucket( auth, 'oss-%s-internal.aliyuncs.com' % context.region, oss_bucket_name) + exist = oss_client.object_exists(object_key) + if not exist: + raise Exception("object {} is not exist".format(object_key)) + input_path = oss_client.sign_url('GET', object_key, 3600) fileDir, shortname, extension = get_fileNameExt(object_key) diff --git a/ffmpeg-app/src/functions/video_gif/index.py b/ffmpeg-app/src/functions/video_gif/index.py index 27c07ed..cc70163 100644 --- a/ffmpeg-app/src/functions/video_gif/index.py +++ b/ffmpeg-app/src/functions/video_gif/index.py @@ -68,6 +68,10 @@ def handler(event, context): oss_client = oss2.Bucket( auth, 'oss-%s-internal.aliyuncs.com' % context.region, oss_bucket_name) + exist = oss_client.object_exists(object_key) + if not exist: + raise Exception("object {} is not exist".format(object_key)) + input_path = oss_client.sign_url('GET', object_key, 3600) fileDir, shortname, extension = get_fileNameExt(object_key) gif_path = os.path.join("/tmp", shortname + ".gif") diff --git a/ffmpeg-app/src/functions/video_watermark/index.py b/ffmpeg-app/src/functions/video_watermark/index.py index 15e26ea..6daddaf 100644 --- a/ffmpeg-app/src/functions/video_watermark/index.py +++ b/ffmpeg-app/src/functions/video_watermark/index.py @@ -73,6 +73,10 @@ def handler(event, context): oss_client = oss2.Bucket( auth, 'oss-%s-internal.aliyuncs.com' % context.region, oss_bucket_name) + exist = oss_client.object_exists(object_key) + if not exist: + raise Exception("object {} is not exist".format(object_key)) + input_path = oss_client.sign_url('GET', object_key, 3600) fileDir, shortname, extension = get_fileNameExt(object_key) dst_video_path = os.path.join("/tmp", "watermark_" + shortname + extension) diff --git a/http-transcode/publish.yaml b/http-transcode/publish.yaml index d2444ec..1678ee2 100644 --- a/http-transcode/publish.yaml +++ b/http-transcode/publish.yaml @@ -2,7 +2,7 @@ Type: Application Name: http-video-transcode Provider: - 阿里云 -Version: 0.0.9 +Version: 0.0.10 Description: 快速部署音视频转码的应用到阿里云函数计算 HomePage: https://github.com/devsapp/start-ffmpeg Tags: diff --git a/http-transcode/src/code/transcode/index.py b/http-transcode/src/code/transcode/index.py index 96dce5a..482fc12 100644 --- a/http-transcode/src/code/transcode/index.py +++ b/http-transcode/src/code/transcode/index.py @@ -42,6 +42,10 @@ def handler(environ, start_response): # size = float(simplifiedmeta.headers['Content-Length']) # M_size = round(size / 1024.0 / 1024.0, 2) + exist = oss_client.object_exists(object_key) + if not exist: + raise Exception("object {} is not exist".format(object_key)) + input_path = oss_client.sign_url('GET', object_key, 6 * 3600) # m3u8 特殊处理 rid = context.request_id diff --git a/transcode/publish.yaml b/transcode/publish.yaml index 7e208cc..8bc3bf7 100644 --- a/transcode/publish.yaml +++ b/transcode/publish.yaml @@ -2,7 +2,7 @@ Type: Application Name: video-transcode Provider: - 阿里云 -Version: 0.0.17 +Version: 0.0.18 Description: 快速部署音视频转码的应用到阿里云函数计算 HomePage: https://github.com/devsapp/start-ffmpeg/tree/master/transcode Tags: diff --git a/transcode/src/code/transcode/index.py b/transcode/src/code/transcode/index.py index d04a74f..5521b41 100644 --- a/transcode/src/code/transcode/index.py +++ b/transcode/src/code/transcode/index.py @@ -35,6 +35,10 @@ def handler(event, context): # size = float(simplifiedmeta.headers['Content-Length']) # M_size = round(size / 1024.0 / 1024.0, 2) + exist = oss_client.object_exists(object_key) + if not exist: + raise Exception("object {} is not exist".format(object_key)) + input_path = oss_client.sign_url('GET', object_key, 6 * 3600) # m3u8 特殊处理 rid = context.request_id diff --git a/update.list b/update.list index e84e31c..e509d8e 100644 --- a/update.list +++ b/update.list @@ -1 +1,3 @@ -./headless-ffmpeg \ No newline at end of file +./transcode +./http-transcode +./ffmpeg-app \ No newline at end of file