diff options
Diffstat (limited to 'libavformat/swf.c')
| -rw-r--r-- | libavformat/swf.c | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/libavformat/swf.c b/libavformat/swf.c index 258bb2fdb7..e85ae2f31d 100644 --- a/libavformat/swf.c +++ b/libavformat/swf.c @@ -61,7 +61,7 @@ typedef struct { offset_t duration_pos; offset_t tag_pos; - + int samples_per_frame; int sound_samples; int video_samples; @@ -120,7 +120,7 @@ static int swf_mp3_info(void *data, int *byteSize, int *samplesPerFrame, int *sa int bitRate = 0; int bitsPerSlot = sBitsPerSlot[layerID]; int isPadded = ((header >> 9) & 0x01); - + if ( (( header >> 21 ) & 0x7ff) != 0x7ff ) { return 0; } @@ -203,7 +203,7 @@ static inline void max_nbits(int *nbits_ptr, int val) *nbits_ptr = n; } -static void put_swf_rect(ByteIOContext *pb, +static void put_swf_rect(ByteIOContext *pb, int xmin, int xmax, int ymin, int ymax) { PutBitContext p; @@ -211,7 +211,7 @@ static void put_swf_rect(ByteIOContext *pb, int nbits, mask; init_put_bits(&p, buf, sizeof(buf)); - + nbits = 0; max_nbits(&nbits, xmin); max_nbits(&nbits, xmax); @@ -225,7 +225,7 @@ static void put_swf_rect(ByteIOContext *pb, put_bits(&p, nbits, xmax & mask); put_bits(&p, nbits, ymin & mask); put_bits(&p, nbits, ymax & mask); - + flush_put_bits(&p); put_buffer(pb, buf, pbBufPtr(&p) - p.buf); } @@ -243,15 +243,15 @@ static void put_swf_line_edge(PutBitContext *pb, int dx, int dy) mask = (1 << nbits) - 1; put_bits(pb, 4, nbits - 2); /* 16 bits precision */ if (dx == 0) { - put_bits(pb, 1, 0); - put_bits(pb, 1, 1); + put_bits(pb, 1, 0); + put_bits(pb, 1, 1); put_bits(pb, nbits, dy & mask); } else if (dy == 0) { - put_bits(pb, 1, 0); - put_bits(pb, 1, 0); + put_bits(pb, 1, 0); + put_bits(pb, 1, 0); put_bits(pb, nbits, dx & mask); } else { - put_bits(pb, 1, 1); + put_bits(pb, 1, 1); put_bits(pb, nbits, dx & mask); put_bits(pb, nbits, dy & mask); } @@ -268,7 +268,7 @@ static void put_swf_matrix(ByteIOContext *pb, int nbits; init_put_bits(&p, buf, sizeof(buf)); - + put_bits(&p, 1, 1); /* a, d present */ nbits = 1; max_nbits(&nbits, a); @@ -276,7 +276,7 @@ static void put_swf_matrix(ByteIOContext *pb, put_bits(&p, 5, nbits); /* nb bits */ put_bits(&p, nbits, a); put_bits(&p, nbits, d); - + put_bits(&p, 1, 1); /* b, c present */ nbits = 1; max_nbits(&nbits, c); @@ -366,14 +366,14 @@ static int swf_write_header(AVFormatContext *s) } else { put_byte(pb, 4); /* version (should use 4 for mpeg audio support) */ } - put_le32(pb, DUMMY_FILE_SIZE); /* dummy size - (will be patched if not streamed) */ + put_le32(pb, DUMMY_FILE_SIZE); /* dummy size + (will be patched if not streamed) */ put_swf_rect(pb, 0, width * 20, 0, height * 20); put_le16(pb, (rate * 256) / rate_base); /* frame rate */ swf->duration_pos = url_ftell(pb); put_le16(pb, (uint16_t)(DUMMY_DURATION * (int64_t)rate / rate_base)); /* frame count */ - + /* define a shape with the jpeg inside */ if ( video_enc && video_enc->codec_id == CODEC_ID_FLV1 ) { } else if ( video_enc && video_enc->codec_id == CODEC_ID_MJPEG ) { @@ -387,28 +387,28 @@ static int swf_write_header(AVFormatContext *s) put_byte(pb, 0x41); /* clipped bitmap fill */ put_le16(pb, BITMAP_ID); /* bitmap ID */ /* position of the bitmap */ - put_swf_matrix(pb, (int)(1.0 * (1 << FRAC_BITS)), 0, + put_swf_matrix(pb, (int)(1.0 * (1 << FRAC_BITS)), 0, 0, (int)(1.0 * (1 << FRAC_BITS)), 0, 0); put_byte(pb, 0); /* no line style */ - + /* shape drawing */ init_put_bits(&p, buf1, sizeof(buf1)); put_bits(&p, 4, 1); /* one fill bit */ put_bits(&p, 4, 0); /* zero line bit */ - + put_bits(&p, 1, 0); /* not an edge */ put_bits(&p, 5, FLAG_MOVETO | FLAG_SETFILL0); put_bits(&p, 5, 1); /* nbits */ put_bits(&p, 1, 0); /* X */ put_bits(&p, 1, 0); /* Y */ put_bits(&p, 1, 1); /* set fill style 1 */ - + /* draw the rectangle ! */ put_swf_line_edge(&p, width, 0); put_swf_line_edge(&p, 0, height); put_swf_line_edge(&p, -width, 0); put_swf_line_edge(&p, 0, -height); - + /* end of shape */ put_bits(&p, 1, 0); /* not an edge */ put_bits(&p, 5, 0); @@ -418,7 +418,7 @@ static int swf_write_header(AVFormatContext *s) put_swf_end_tag(s); } - + if (audio_enc && audio_enc->codec_id == CODEC_ID_MP3 ) { int v; @@ -450,7 +450,7 @@ static int swf_write_header(AVFormatContext *s) put_byte(&s->pb, v); put_le16(&s->pb, swf->samples_per_frame); /* avg samples per frame */ put_le16(&s->pb, 0); - + put_swf_end_tag(s); } @@ -458,7 +458,7 @@ static int swf_write_header(AVFormatContext *s) return 0; } -static int swf_write_video(AVFormatContext *s, +static int swf_write_video(AVFormatContext *s, AVCodecContext *enc, const uint8_t *buf, int size) { SWFContext *swf = s->priv_data; @@ -466,7 +466,7 @@ static int swf_write_video(AVFormatContext *s, int c = 0; int outSize = 0; int outSamples = 0; - + /* Flash Player limit */ if ( swf->swf_frame_number == 16000 ) { av_log(enc, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n"); @@ -480,13 +480,13 @@ retry_swf_audio_packet: int mp3SampleRate = 0; int mp3IsMono = 0; int mp3SamplesPerFrame = 0; - + /* copy out mp3 header from ring buffer */ uint8_t header[4]; for (c=0; c<4; c++) { header[c] = swf->audio_fifo[(swf->audio_in_pos+outSize+c) % AUDIO_FIFO_SIZE]; } - + if ( swf_mp3_info(header,&mp3FrameSize,&mp3SamplesPerFrame,&mp3SampleRate,&mp3IsMono) ) { if ( ( swf->audio_size-outSize ) >= mp3FrameSize ) { outSize += mp3FrameSize; @@ -497,7 +497,7 @@ retry_swf_audio_packet: } } else { /* invalid mp3 data, skip forward - we need to do this since the Flash Player + we need to do this since the Flash Player does not like custom headers */ swf->audio_in_pos ++; swf->audio_size --; @@ -505,7 +505,7 @@ retry_swf_audio_packet: goto retry_swf_audio_packet; } } - + /* audio stream is behind video stream, bail */ if ( ( swf->sound_samples + outSamples + swf->samples_per_frame ) < swf->video_samples ) { return 0; @@ -523,7 +523,7 @@ retry_swf_audio_packet: put_byte(pb, 0); put_byte(pb, SWF_VIDEO_CODEC_FLV1); put_swf_end_tag(s); - + /* place the video object for the first time */ put_swf_tag(s, TAG_PLACEOBJECT2); put_byte(pb, 0x36); @@ -546,10 +546,10 @@ retry_swf_audio_packet: put_le16(pb, swf->video_frame_number ); put_swf_end_tag(s); } - + /* set video frame data */ put_swf_tag(s, TAG_VIDEOFRAME | TAG_LONG); - put_le16(pb, VIDEO_ID); + put_le16(pb, VIDEO_ID); put_le16(pb, swf->video_frame_number++ ); put_buffer(pb, buf, size); put_swf_end_tag(s); @@ -560,29 +560,29 @@ retry_swf_audio_packet: put_le16(pb, SHAPE_ID); /* shape ID */ put_le16(pb, 1); /* depth */ put_swf_end_tag(s); - + /* free the bitmap */ put_swf_tag(s, TAG_FREECHARACTER); put_le16(pb, BITMAP_ID); put_swf_end_tag(s); } - + put_swf_tag(s, TAG_JPEG2 | TAG_LONG); - + put_le16(pb, BITMAP_ID); /* ID of the image */ - + /* a dummy jpeg header seems to be required */ - put_byte(pb, 0xff); + put_byte(pb, 0xff); put_byte(pb, 0xd8); put_byte(pb, 0xff); put_byte(pb, 0xd9); /* write the jpeg image */ put_buffer(pb, buf, size); - + put_swf_end_tag(s); - + /* draw the shape */ - + put_swf_tag(s, TAG_PLACEOBJECT); put_le16(pb, SHAPE_ID); /* shape ID */ put_le16(pb, 1); /* depth */ @@ -591,7 +591,7 @@ retry_swf_audio_packet: } else { /* invalid codec */ } - + swf->swf_frame_number ++; swf->video_samples += swf->samples_per_frame; @@ -605,7 +605,7 @@ retry_swf_audio_packet: put_byte(pb,swf->audio_fifo[(swf->audio_in_pos+c) % AUDIO_FIFO_SIZE]); } put_swf_end_tag(s); - + /* update FIFO */ swf->sound_samples += outSamples; swf->audio_in_pos += outSize; @@ -616,13 +616,13 @@ retry_swf_audio_packet: /* output the frame */ put_swf_tag(s, TAG_SHOWFRAME); put_swf_end_tag(s); - + put_flush_packet(&s->pb); - + return 0; } -static int swf_write_audio(AVFormatContext *s, +static int swf_write_audio(AVFormatContext *s, AVCodecContext *enc, const uint8_t *buf, int size) { SWFContext *swf = s->priv_data; @@ -675,7 +675,7 @@ static int swf_write_trailer(AVFormatContext *s) put_swf_tag(s, TAG_END); put_swf_end_tag(s); - + put_flush_packet(&s->pb); /* patch file size and number of frames if not streamed */ @@ -686,7 +686,7 @@ static int swf_write_trailer(AVFormatContext *s) url_fseek(pb, swf->duration_pos, SEEK_SET); put_le16(pb, video_enc->frame_number); } - + av_free(swf->audio_fifo); return 0; @@ -697,13 +697,13 @@ static int swf_write_trailer(AVFormatContext *s) /* Extract FLV encoded frame and MP3 from swf Note that the detection of the real frame is inaccurate at this point as it can be - quite tricky to determine, you almost certainly + quite tricky to determine, you almost certainly will get a bad audio/video sync */ static int get_swf_tag(ByteIOContext *pb, int *len_ptr) { int tag, len; - + if (url_feof(pb)) return -1; @@ -761,9 +761,9 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) url_fskip(pb, len); frame_rate = get_le16(pb); get_le16(pb); /* frame count */ - - /* The Flash Player converts 8.8 frame rates - to milliseconds internally. Do the same to get + + /* The Flash Player converts 8.8 frame rates + to milliseconds internally. Do the same to get a correct framerate */ swf->ms_per_frame = ( 1000 * 256 ) / frame_rate; swf->samples_per_frame = 0; @@ -793,7 +793,7 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) if ( get_byte(pb) == SWF_VIDEO_CODEC_FLV1 ) { vst = av_new_stream(s, 0); av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */ - + vst->codec->codec_type = CODEC_TYPE_VIDEO; vst->codec->codec_id = CODEC_ID_FLV1; if ( swf->samples_per_frame ) { @@ -845,7 +845,7 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) } } url_fseek(pb, firstTagOff, SEEK_SET); - + return 0; } @@ -855,10 +855,10 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) ByteIOContext *pb = &s->pb; AVStream *st = 0; int tag, len, i, frame; - + for(;;) { tag = get_swf_tag(pb, &len); - if (tag < 0) + if (tag < 0) return AVERROR_IO; if (tag == TAG_VIDEOFRAME) { for( i=0; i<s->nb_streams; i++ ) { @@ -875,7 +875,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) continue; } } - } + } url_fskip(pb, len); } else if (tag == TAG_STREAMBLOCK) { for( i=0; i<s->nb_streams; i++ ) { |