566246 - Merge libnestegg to mozilla-central

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Need to extract the patches from mozilla-webmedia, attach a unified patch
here and get reviews.

Comment 1

[Matthew Gregan [:kinetik]]

Attachment: import libnestegg v0

Import media/libnestegg and toolkit/content/license.html changes.  Does not include any changes to the build system--they should be included in the patch attached to the import libvpx bug.

Comment 2

[Matthew Gregan [:kinetik]]

Note that this imports a newer version of libnestegg than we included in the nightly-webm dev builds.

Comment 3

[cajbir (:cajbir)]

Comment on attachment 446433 [details] [diff] [review]
import libnestegg v0

r+ with the changes below

> diff --git a/media/libnestegg/include/nestegg.h b/media/libnestegg/include/nestegg.h
>    @code
>    nestegg * ctx;
>    nestegg_init(&ctx, io);

Documentation is out of date to the implementation. Missing log parameter.

>  /** User supplied read callback.
>      @param buffer  Buffer to read data into.
>      @param length  Length of supplied buffer in bytes.
>      @param userptr The #userdata supplied by the user.
>      @retval  1 Read succeeded.
>      @retval  0 End of stream.
>      @retval -1 Error. */
>  int (* read)(void * buffer, size_t length, void * userdata);

Documentation says the last parameter is 'userptr' but it is 'userdata'.

>    @retval #NESTEGG_TRACK_VIDEO Track type is audio.

Should be NESTEGG_TRACK_AUDIO

diff --git a/media/libnestegg/src/nestegg.c b/media/libnestegg/src/nestegg.c
>#if 0
>static void
>pool_free(void * p)
>{
>  h_free(p);
>}
>#endif

Unused code/comment.

>#if 0
>static int
>get_int(struct ebml_type type, int64_t * value)
>{
>  if (!type.read)
>    return -1;
>
>  assert(type.type == TYPE_INT);
>
>  *value = type.v.i;
>
>  return 0;
>}
>#endif

Unused code/comment.

Comment 4

[Matthew Gregan [:kinetik]]

Attachment: patch v1

Address review comments.  Also includes upstream change (http://github.com/kinetiknz/nestegg/commit/8977670dd9c04bd4984a329595fafac8f6100f3e) to ignore track timecode scale, as this is not supported in WebM.

Comment 5

[Matthew Gregan [:kinetik]]

Attachment: patch v2

Same as v1 but update.sh is updated to reflect autotoolified directory structure of nestegg and copyright is assigned to MoFo.

Comment 6

[Matthew Gregan [:kinetik]]

Attachment: patch v3

Same as v2, but moves stdint.h cruft out to a separate file.

Comment 7

[Matthew Gregan [:kinetik]]

Attachment: patch v4

Sorry for the bugspam.

Same as v3, but includes seek-to-end fix from http://github.com/kinetiknz/nestegg/commit/f9b8ff50024a9c6cc768249a19ce7a2107cf83f9.

Rerequesting review as this includes a logic change.

Comment 8

[Matthew Gregan [:kinetik]]

We should probably add libnestegg to https://wiki.mozilla.org/ThirdPartyCode when we check in.

Comment 9

[Johnny Stenback (:jst)]

We want WebM support in alpha 5, marking as a blocker.

Comment 10

[Chris Pearce [:cpearce (Not reading bugmail)]]

http://hg.mozilla.org/mozilla-central/rev/b391708e9552