Skip to content

Commit

Permalink
Bug 1306477 - Updates to latest upstream version of nestegg. r=kinetik
Browse files Browse the repository at this point in the history
MozReview-Commit-ID: D2vrjB3wOjh
  • Loading branch information
Jay Harris committed Feb 8, 2017
1 parent 7fd57ad commit c10e7de
Show file tree
Hide file tree
Showing 3 changed files with 203 additions and 77 deletions.
2 changes: 1 addition & 1 deletion media/libnestegg/README_MOZILLA
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.

The nestegg git repository is: git://github.com/kinetiknz/nestegg.git

The git commit ID used was 1eeeccee205f7aee0386898508c1a68427e0dcc2.
The git commit ID used was 5e2fb721d5808785475d68f63fc97d45b8a4ef03.
21 changes: 18 additions & 3 deletions media/libnestegg/include/nestegg.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ extern "C" {
#define NESTEGG_ENCODING_COMPRESSION 0 /**< Content encoding type is compression. */
#define NESTEGG_ENCODING_ENCRYPTION 1 /**< Content encoding type is encryption. */

#define NESTEGG_PACKET_HAS_SIGNAL_BYTE_FALSE 0 /**< Packet does not have signal byte */
#define NESTEGG_PACKET_HAS_SIGNAL_BYTE_UNENCRYPTED 1 /**< Packet has signal byte and is unencrypted */
#define NESTEGG_PACKET_HAS_SIGNAL_BYTE_ENCRYPTED 2 /**< Packet has signal byte and is encrypted */
#define NESTEGG_PACKET_HAS_SIGNAL_BYTE_FALSE 0 /**< Packet does not have signal byte */
#define NESTEGG_PACKET_HAS_SIGNAL_BYTE_UNENCRYPTED 1 /**< Packet has signal byte and is unencrypted */
#define NESTEGG_PACKET_HAS_SIGNAL_BYTE_ENCRYPTED 2 /**< Packet has signal byte and is encrypted */
#define NESTEGG_PACKET_HAS_SIGNAL_BYTE_PARTITIONED 4 /**< Packet has signal byte and is partitioned */

#define NESTEGG_PACKET_HAS_KEYFRAME_FALSE 0 /**< Packet contains only keyframes. */
#define NESTEGG_PACKET_HAS_KEYFRAME_TRUE 1 /**< Packet does not contain any keyframes */
Expand Down Expand Up @@ -424,6 +425,8 @@ int nestegg_packet_discard_padding(nestegg_packet * packet,
set, encryption information not read from packet.
@retval #NESTEGG_PACKET_HAS_SIGNAL_BYTE_ENCRYPTED Encrypted bit set,
encryption infomation read from packet.
@retval #NESTEGG_PACKET_HAS_SIGNAL_BYTE_PARTITIONED Partitioned bit set,
encryption and parition information read from packet.
@retval -1 Error.*/
int nestegg_packet_encryption(nestegg_packet * packet);

Expand All @@ -439,6 +442,18 @@ int nestegg_packet_encryption(nestegg_packet * packet);
int nestegg_packet_iv(nestegg_packet * packet, unsigned char const ** iv,
size_t * length);

/** Query the packet for offsets.
@param packet Packet initialized by #nestegg_read_packet.
@param partition_offsets Storage for queried offsets.
@param num_offsets Length of returned offsets, may be 0.
The data is owned by the #nestegg_packet packet.
@retval 0 Success.
@retval -1 Error.
*/
int nestegg_packet_offsets(nestegg_packet * packet,
uint32_t const ** partition_offsets,
uint8_t * num_offsets);

/** Returns reference_block given packet
@param packet Packet initialized by #nestegg_read_packet.
@param reference_block pointer to store reference block in.
Expand Down
Loading

0 comments on commit c10e7de

Please sign in to comment.