| theora.h | theora.h | |||
|---|---|---|---|---|
| skipping to change at line 181 | skipping to change at line 181 | |||
| * A Chroma subsampling | * A Chroma subsampling | |||
| * | * | |||
| * These enumerate the available chroma subsampling options supported | * These enumerate the available chroma subsampling options supported | |||
| * by the theora format. See Section 4.4 of the specification for | * by the theora format. See Section 4.4 of the specification for | |||
| * exact definitions. | * exact definitions. | |||
| */ | */ | |||
| typedef enum { | typedef enum { | |||
| OC_PF_420, /**< Chroma subsampling by 2 in each direction (4:2:0) */ | OC_PF_420, /**< Chroma subsampling by 2 in each direction (4:2:0) */ | |||
| OC_PF_RSVD, /**< Reserved value */ | OC_PF_RSVD, /**< Reserved value */ | |||
| OC_PF_422, /**< Horizonatal chroma subsampling by 2 (4:2:2) */ | OC_PF_422, /**< Horizonatal chroma subsampling by 2 (4:2:2) */ | |||
| OC_PF_444, /**< No chroma subsampling at all (4:4:4) */ | OC_PF_444 /**< No chroma subsampling at all (4:4:4) */ | |||
| } theora_pixelformat; | } theora_pixelformat; | |||
| /** | /** | |||
| * Theora bitstream info. | * Theora bitstream info. | |||
| * Contains the basic playback parameters for a stream, | * Contains the basic playback parameters for a stream, | |||
| * corresponding to the initial 'info' header packet. | * corresponding to the initial 'info' header packet. | |||
| * | * | |||
| * Encoded theora frames must be a multiple of 16 in width and height. | * Encoded theora frames must be a multiple of 16 in width and height. | |||
| * To handle other frame sizes, a crop rectangle is specified in | * To handle other frame sizes, a crop rectangle is specified in | |||
| * frame_height and frame_width, offset_x and * offset_y. The offset | * frame_height and frame_width, offset_x and * offset_y. The offset | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| theoradec.h | theoradec.h | |||
|---|---|---|---|---|
| skipping to change at line 278 | skipping to change at line 278 | |||
| * \param _granpos Returns the granule position of the decoded packet. | * \param _granpos Returns the granule position of the decoded packet. | |||
| * If non-<tt>NULL</tt>, the granule position for this spec ific | * If non-<tt>NULL</tt>, the granule position for this spec ific | |||
| * packet is stored in this location. | * packet is stored in this location. | |||
| * This is computed incrementally from previously decoded | * This is computed incrementally from previously decoded | |||
| * packets. | * packets. | |||
| * After a seek, the correct granule position must be set v ia | * After a seek, the correct granule position must be set v ia | |||
| * #TH_DECCTL_SET_GRANPOS for this to work properly. | * #TH_DECCTL_SET_GRANPOS for this to work properly. | |||
| * \retval 0 Success. | * \retval 0 Success. | |||
| * A new decoded frame can be retrieved by calling | * A new decoded frame can be retrieved by calling | |||
| * th_decode_ycbcr_out(). | * th_decode_ycbcr_out(). | |||
| * \retval TH_DUPFRAME The packet represented a dropped (0-byte) frame. | * \retval TH_DUPFRAME The packet represented a dropped frame (either a | |||
| * 0-byte frame or an INTER frame with no coded bloc | ||||
| ks). | ||||
| * The player can skip the call to th_decode_ycbcr_ou t(), | * The player can skip the call to th_decode_ycbcr_ou t(), | |||
| * as the contents of the decoded frame buffer have not | * as the contents of the decoded frame buffer have not | |||
| * changed. | * changed. | |||
| * \retval TH_EFAULT \a _dec or \a _op was <tt>NULL</tt>. | * \retval TH_EFAULT \a _dec or \a _op was <tt>NULL</tt>. | |||
| * \retval TH_EBADPACKET \a _op does not contain encoded video data. | * \retval TH_EBADPACKET \a _op does not contain encoded video data. | |||
| * \retval TH_EIMPL The video data uses bitstream features which this | * \retval TH_EIMPL The video data uses bitstream features which this | |||
| * library does not support.*/ | * library does not support.*/ | |||
| extern int th_decode_packetin(th_dec_ctx *_dec,const ogg_packet *_op, | extern int th_decode_packetin(th_dec_ctx *_dec,const ogg_packet *_op, | |||
| ogg_int64_t *_granpos); | ogg_int64_t *_granpos); | |||
| /**Outputs the next available frame of decoded Y'CbCr data. | /**Outputs the next available frame of decoded Y'CbCr data. | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 3 lines changed or added | |||