headers
darkshikari | 1 Jul 2009 01:45
Picon

r19310 - trunk/libavcodec/libx264.c

Author: darkshikari
Date: Wed Jul  1 01:45:01 2009
New Revision: 19310

Log:
Fix libx264.c to not drop SEI userdata from x264 encoder.
Most muxers in ffmpeg ignore the SEI if it is placed in extradata, so instead
it has to be catted to the front of the first video frame.

Modified:
   trunk/libavcodec/libx264.c

Modified: trunk/libavcodec/libx264.c
==============================================================================
--- trunk/libavcodec/libx264.c	Tue Jun 30 17:11:51 2009	(r19309)
+++ trunk/libavcodec/libx264.c	Wed Jul  1 01:45:01 2009	(r19310)
 <at>  <at>  -30,6 +30,8  <at>  <at>  typedef struct X264Context {
     x264_param_t params;
     x264_t *enc;
     x264_picture_t pic;
+    uint8_t *sei;
+    int sei_size;
     AVFrame out_pic;
 } X264Context;

 <at>  <at>  -51,13 +53,30  <at>  <at>  X264_log(void *p, int level, const char 

 
 static int
-encode_nals(uint8_t *buf, int size, x264_nal_t *nals, int nnal)
(Continue reading)

Permalink | Reply | 0 comments |
headers
mru | 1 Jul 2009 02:55
Picon

r19311 - trunk/libavutil/arm/bswap.h

Author: mru
Date: Wed Jul  1 02:55:15 2009
New Revision: 19311

Log:
ARM: use gcc inline asm in bswap.h only when available

Modified:
   trunk/libavutil/arm/bswap.h

Modified: trunk/libavutil/arm/bswap.h
==============================================================================
--- trunk/libavutil/arm/bswap.h	Wed Jul  1 01:45:01 2009	(r19310)
+++ trunk/libavutil/arm/bswap.h	Wed Jul  1 02:55:15 2009	(r19311)
 <at>  <at>  -40,7 +40,7  <at>  <at>  static av_always_inline av_const uint32_
 }
 #endif /* HAVE_ARMV6 */

-#else /* __ARMCC_VERSION */
+#elif HAVE_INLINE_ASM

 #if HAVE_ARMV6
 #define bswap_16 bswap_16
Permalink | Reply | 0 comments |
headers
mru | 1 Jul 2009 02:55
Picon

r19312 - trunk/libavcodec/adpcm.c

Author: mru
Date: Wed Jul  1 02:55:17 2009
New Revision: 19312

Log:
ADPCM: remove unreachable break statement after return

Modified:
   trunk/libavcodec/adpcm.c

Modified: trunk/libavcodec/adpcm.c
==============================================================================
--- trunk/libavcodec/adpcm.c	Wed Jul  1 02:55:15 2009	(r19311)
+++ trunk/libavcodec/adpcm.c	Wed Jul  1 02:55:17 2009	(r19312)
 <at>  <at>  -191,7 +191,6  <at>  <at>  static av_cold int adpcm_encode_init(AVC
         break;
     default:
         return -1;
-        break;
     }

     avctx->coded_frame= avcodec_alloc_frame();
Permalink | Reply | 0 comments |
headers
Mike Melanson | 1 Jul 2009 07:08

Re: r19300 - trunk/libavcodec/mpegaudio_parser.c

Michael Niedermayer wrote:
> On Tue, Jun 30, 2009 at 09:03:38AM +0100, Måns Rullgård wrote:
>> michael <subversion <at> mplayerhq.hu> writes:
>>
>>> Author: michael
>>> Date: Tue Jun 30 05:12:50 2009
>>> New Revision: 19300
>>>
>>> Log:
>>> Rewrite mp3 parser. New code is much simpler and does not drop
>>> stuff at random.
>> This changed the seektest output and one FATE test.  The changes are
>> probably OK, but references need to be updated.
> 
> indeed, fixed seektest, thanks for spotting and sorry for forgetting to
> run regression tests yesterday

One more short MP3 frame is being parsed at the end of the sample MTV 
file. I suspect that's an improvement. Test updated.

--

-- 
     -Mike Melanson
Permalink | Reply | 0 comments |
headers
bcoudurier | 1 Jul 2009 08:48
Picon

r19313 - trunk/libavcodec/libvorbis.c

Author: bcoudurier
Date: Wed Jul  1 08:48:27 2009
New Revision: 19313

Log:
add missing \n to error message

Modified:
   trunk/libavcodec/libvorbis.c

Modified: trunk/libavcodec/libvorbis.c
==============================================================================
--- trunk/libavcodec/libvorbis.c	Wed Jul  1 02:55:17 2009	(r19312)
+++ trunk/libavcodec/libvorbis.c	Wed Jul  1 08:48:27 2009	(r19313)
 <at>  <at>  -90,7 +90,7  <at>  <at>  static av_cold int oggvorbis_encode_init

     vorbis_info_init(&context->vi) ;
     if(oggvorbis_init_encoder(&context->vi, avccontext) < 0) {
-        av_log(avccontext, AV_LOG_ERROR, "oggvorbis_encode_init: init_encoder failed") ;
+        av_log(avccontext, AV_LOG_ERROR, "oggvorbis_encode_init: init_encoder failed\n") ;
         return -1 ;
     }
     vorbis_analysis_init(&context->vd, &context->vi) ;
Permalink | Reply | 0 comments |
headers
Diego Biurrun | 1 Jul 2009 12:04
Picon
Gravatar

Re: r19302 - trunk/libavcodec/mpegaudiodec.c

On Tue, Jun 30, 2009 at 08:00:04PM +0100, Jethro Walters wrote:
> Diego Biurrun wrote:
> > On Tue, Jun 30, 2009 at 01:32:54PM +0100, Jethro Walters wrote:
> >> michael wrote:
> >>> Log:
> >>> Drop code that attempts to decode frames that are prefixed by junk,
> >>> it does too often end up decoding random data into noise without
> >>> detecting it. (for example after seeking of some mp3 data with oddly
> >>> often occuring startcode emulation)
> >>> fixes issue1154.
> >> Can I suggest a slight change to this commit message?
> >>
> >> Drop code that attempts to decode frames that are prefixed by junk,
> >> too often it ends up decoding random data into noise without detecting
> >> it (for example after seeking of some mp3 data with oddly often occuring
> >> startcode emulation).
> > 
> > Good idea, applied with some extra fixes.
> 
> I am always amazed at how foreigners speak and write our language better
> than we do. :)

Since it became the world language, it's not your language anymore ;-p
But in any case I can assure you that I don't speak half as good as I
write, so...

Diego
Permalink | Reply | 1 comment |
headers
mru | 1 Jul 2009 12:36
Picon
Subject: r19314 - in trunk/libavcodec: avcodec.h imgconvert.c

r19314 - in trunk/libavcodec: avcodec.h imgconvert.c

Author: mru
Date: Wed Jul  1 12:36:18 2009
New Revision: 19314

Log:
Fix argument type mismatches for av_picture_crop and av_picture_fill

Modified:
   trunk/libavcodec/avcodec.h
   trunk/libavcodec/imgconvert.c

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	Wed Jul  1 08:48:27 2009	(r19313)
+++ trunk/libavcodec/avcodec.h	Wed Jul  1 12:36:18 2009	(r19314)
 <at>  <at>  -2902,7 +2902,7  <at>  <at>  void avpicture_free(AVPicture *picture);
  *  <at> return size of the image data in bytes
  */
 int avpicture_fill(AVPicture *picture, uint8_t *ptr,
-                   int pix_fmt, int width, int height);
+                   enum PixelFormat pix_fmt, int width, int height);
 int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
                      unsigned char *dest, int dest_size);

Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c	Wed Jul  1 08:48:27 2009	(r19313)
+++ trunk/libavcodec/imgconvert.c	Wed Jul  1 12:36:18 2009	(r19314)
 <at>  <at>  -1288,7 +1288,7  <at>  <at>  static inline int is_yuv_planar(const Pi
 }
(Continue reading)

Permalink | Reply | 0 comments |
headers
Robert Swain | 1 Jul 2009 14:02
Picon

Re: r19302 - trunk/libavcodec/mpegaudiodec.c

On Wed, 01 Jul 2009 12:04:23 +0200, Diego Biurrun <diego <at> biurrun.de>
wrote:
> On Tue, Jun 30, 2009 at 08:00:04PM +0100, Jethro Walters wrote:
> > Diego Biurrun wrote:
> > > On Tue, Jun 30, 2009 at 01:32:54PM +0100, Jethro Walters wrote:
> > >> michael wrote:
> > >>> Log:
> > >>> Drop code that attempts to decode frames that are prefixed by
> > >>> junk, it does too often end up decoding random data into noise
> > >>> without detecting it. (for example after seeking of some mp3
> > >>> data with oddly often occuring startcode emulation)
> > >>> fixes issue1154.
> > >> Can I suggest a slight change to this commit message?
> > >>
> > >> Drop code that attempts to decode frames that are prefixed by
> > >> junk, too often it ends up decoding random data into noise
> > >> without detecting it (for example after seeking of some mp3 data
> > >> with oddly often occuring startcode emulation).
> > > 
> > > Good idea, applied with some extra fixes.
> > 
> > I am always amazed at how foreigners speak and write our language
> > better than we do. :)
> 
> Since it became the world language, it's not your language anymore ;-p
> But in any case I can assure you that I don't speak half as good as I
> write, so...

Neither do most natives, me included.
(Continue reading)

Permalink | Reply | 0 comments |
headers
mru | 1 Jul 2009 14:40
Picon

r29409 - trunk/libswscale/swscale_internal.h

Author: mru
Date: Wed Jul  1 14:40:28 2009
New Revision: 29409

Log:
Use enum PixelFormat in sws_format_name() prototype

Modified:
   trunk/libswscale/swscale_internal.h

Modified: trunk/libswscale/swscale_internal.h
==============================================================================
--- trunk/libswscale/swscale_internal.h	Sun Jun 28 15:19:26 2009	(r29408)
+++ trunk/libswscale/swscale_internal.h	Wed Jul  1 14:40:28 2009	(r29409)
 <at>  <at>  -294,7 +294,7  <at>  <at>  void ff_yuv2packedX_altivec(SwsContext *
                             const int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
                             uint8_t *dest, int dstW, int dstY);

-const char *sws_format_name(int format);
+const char *sws_format_name(enum PixelFormat format);

 //FIXME replace this with something faster
 #define is16BPS(x)      (           \
Permalink | Reply | 0 comments |
headers
diego | 1 Jul 2009 15:46
Picon

r19315 - trunk/tools/qt-faststart.c

Author: diego
Date: Wed Jul  1 15:46:26 2009
New Revision: 19315

Log:
Use slightly more appropriate format strings for printing decimal values.
patch by Frank Barchard, fbarchard google com

Modified:
   trunk/tools/qt-faststart.c

Modified: trunk/tools/qt-faststart.c
==============================================================================
--- trunk/tools/qt-faststart.c	Wed Jul  1 12:36:18 2009	(r19314)
+++ trunk/tools/qt-faststart.c	Wed Jul  1 15:46:26 2009	(r19315)
 <at>  <at>  -129,7 +129,7  <at>  <at>  int main(int argc, char *argv[])
             ftyp_atom_size = atom_size;
             ftyp_atom = malloc(ftyp_atom_size);
             if (!ftyp_atom) {
-                printf ("could not allocate 0x%"PRId64" byte for ftyp atom\n",
+                printf ("could not allocate %"PRIu64" byte for ftyp atom\n",
                         atom_size);
                 fclose(infile);
                 return 1;
 <at>  <at>  -170,7 +170,7  <at>  <at>  int main(int argc, char *argv[])
     moov_atom_size = atom_size;
     moov_atom = malloc(moov_atom_size);
     if (!moov_atom) {
-        printf ("could not allocate 0x%"PRId64" byte for moov atom\n",
+        printf ("could not allocate %"PRIu64" byte for moov atom\n",
(Continue reading)

Permalink | Reply | 0 comments |

Gmane