summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libavformat/swf.c8
-rw-r--r--libavformat/swfdec.c10
-rw-r--r--libavformat/swfenc.c31
3 files changed, 35 insertions, 14 deletions
diff --git a/libavformat/swf.c b/libavformat/swf.c
index 1aa434a0ea..a3471d917a 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -23,7 +23,9 @@
#include "internal.h"
const AVCodecTag ff_swf_codec_tags[] = {
- { AV_CODEC_ID_FLV1, 0x02 },
- { AV_CODEC_ID_VP6F, 0x04 },
- { AV_CODEC_ID_NONE, 0 },
+ { AV_CODEC_ID_FLV1, 0x02 },
+ { AV_CODEC_ID_FLASHSV, 0x03 },
+ { AV_CODEC_ID_VP6F, 0x04 },
+ { AV_CODEC_ID_VP6A, 0x05 },
+ { AV_CODEC_ID_NONE, 0 },
};
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 1463f0ad4d..9416187803 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -33,6 +33,7 @@
#include "libavutil/intreadwrite.h"
#include "libavcodec/get_bits.h"
#include "swf.h"
+#include "flv.h"
typedef struct SWFDecContext {
int samples_per_frame;
@@ -307,15 +308,24 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
for(i=0; i<s->nb_streams; i++) {
st = s->streams[i];
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && st->id == ch_id) {
+ int pkt_flags = 0;
frame = avio_rl16(pb);
len -= 2;
if (len <= 0)
goto skip;
+ if (st->codecpar->codec_id == AV_CODEC_ID_FLASHSV) {
+ unsigned flags = avio_r8(pb);
+ len--;
+ if (len <= 0)
+ goto skip;
+ pkt_flags |= (flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ? AV_PKT_FLAG_KEY : 0;
+ }
if ((res = av_get_packet(pb, pkt, len)) < 0)
return res;
pkt->pos = pos;
pkt->pts = frame;
pkt->stream_index = st->index;
+ pkt->flags |= pkt_flags;
return pkt->size;
}
}
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c
index a0b7615629..7e4e214014 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -24,6 +24,7 @@
#include "libavutil/avassert.h"
#include "libavutil/fifo.h"
#include "avformat.h"
+#include "flv.h"
#include "swf.h"
#define AUDIO_FIFO_SIZE 65536
@@ -222,14 +223,13 @@ static int swf_write_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "SWF muxer only supports 1 video stream\n");
return AVERROR_INVALIDDATA;
}
- if (par->codec_id == AV_CODEC_ID_VP6F ||
- par->codec_id == AV_CODEC_ID_FLV1 ||
+ if (ff_codec_get_tag(ff_swf_codec_tags, par->codec_id) ||
par->codec_id == AV_CODEC_ID_PNG ||
par->codec_id == AV_CODEC_ID_MJPEG) {
swf->video_st = s->streams[i];
swf->video_par = par;
} else {
- av_log(s, AV_LOG_ERROR, "SWF muxer only supports VP6, FLV1, PNG and MJPEG\n");
+ av_log(s, AV_LOG_ERROR, "SWF muxer only supports VP6, FLV, Flash Screen Video, PNG and MJPEG\n");
return -1;
}
}
@@ -258,8 +258,12 @@ static int swf_write_header(AVFormatContext *s)
if (!strcmp("avm2", s->oformat->name))
version = 9;
- else if (swf->video_par && (swf->video_par->codec_id == AV_CODEC_ID_VP6F || swf->video_par->codec_id == AV_CODEC_ID_PNG))
- version = 8; /* version 8 and above support VP6 codec */
+ else if (swf->video_par && (swf->video_par->codec_id == AV_CODEC_ID_VP6A ||
+ swf->video_par->codec_id == AV_CODEC_ID_VP6F ||
+ swf->video_par->codec_id == AV_CODEC_ID_PNG))
+ version = 8; /* version 8 and above support VP6 and PNG codec */
+ else if (swf->video_par && swf->video_par->codec_id == AV_CODEC_ID_FLASHSV)
+ version = 7; /* version 7 and above support Flash Screen Video codec */
else if (swf->video_par && swf->video_par->codec_id == AV_CODEC_ID_FLV1)
version = 6; /* version 6 and above support FLV1 codec */
else
@@ -359,17 +363,17 @@ static int swf_write_header(AVFormatContext *s)
}
static int swf_write_video(AVFormatContext *s,
- AVCodecParameters *par, const uint8_t *buf, int size)
+ AVCodecParameters *par, const uint8_t *buf, int size, unsigned pkt_flags)
{
SWFEncContext *swf = s->priv_data;
AVIOContext *pb = s->pb;
+ unsigned codec_tag = ff_codec_get_tag(ff_swf_codec_tags, par->codec_id);
/* Flash Player limit */
if (swf->swf_frame_number == 16000)
av_log(s, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n");
- if (par->codec_id == AV_CODEC_ID_VP6F ||
- par->codec_id == AV_CODEC_ID_FLV1) {
+ if (codec_tag) {
if (swf->video_frame_number == 0) {
/* create a new video object */
put_swf_tag(s, TAG_VIDEOSTREAM);
@@ -379,7 +383,7 @@ static int swf_write_video(AVFormatContext *s,
avio_wl16(pb, par->width);
avio_wl16(pb, par->height);
avio_w8(pb, 0);
- avio_w8(pb,ff_codec_get_tag(ff_swf_codec_tags, par->codec_id));
+ avio_w8(pb, codec_tag);
put_swf_end_tag(s);
/* place the video object for the first time */
@@ -405,6 +409,11 @@ static int swf_write_video(AVFormatContext *s,
put_swf_tag(s, TAG_VIDEOFRAME | TAG_LONG);
avio_wl16(pb, VIDEO_ID);
avio_wl16(pb, swf->video_frame_number++);
+ if (par->codec_id == AV_CODEC_ID_FLASHSV) {
+ /* FrameType and CodecId is needed here even if it is not documented correctly in the SWF specs */
+ int flags = codec_tag | (pkt_flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER);
+ avio_w8(pb, flags);
+ }
avio_write(pb, buf, size);
put_swf_end_tag(s);
} else if (par->codec_id == AV_CODEC_ID_MJPEG || par->codec_id == AV_CODEC_ID_PNG) {
@@ -483,7 +492,7 @@ static int swf_write_audio(AVFormatContext *s,
/* if audio only stream make sure we add swf frames */
if (!swf->video_par)
- swf_write_video(s, par, 0, 0);
+ swf_write_video(s, par, 0, 0, 0);
return 0;
}
@@ -494,7 +503,7 @@ static int swf_write_packet(AVFormatContext *s, AVPacket *pkt)
if (par->codec_type == AVMEDIA_TYPE_AUDIO)
return swf_write_audio(s, par, pkt->data, pkt->size);
else
- return swf_write_video(s, par, pkt->data, pkt->size);
+ return swf_write_video(s, par, pkt->data, pkt->size, pkt->flags);
}
static int swf_write_trailer(AVFormatContext *s)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 17:22:37 +0000