theora.c 30.7 KB
Newer Older
Gildas Bazin's avatar
 
Gildas Bazin committed
1 2 3
/*****************************************************************************
 * theora.c: theora decoder module making use of libtheora.
 *****************************************************************************
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
4
 * Copyright (C) 1999-2012 VLC authors and VideoLAN
5
 * $Id$
Gildas Bazin's avatar
 
Gildas Bazin committed
6
 *
7
 * Authors: Gildas Bazin <gbazin@videolan.org>
Gildas Bazin's avatar
 
Gildas Bazin committed
8
 *
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
9 10 11
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as published by
 * the Free Software Foundation; either version 2.1 of the License, or
Gildas Bazin's avatar
 
Gildas Bazin committed
12
 * (at your option) any later version.
Sam Hocevar's avatar
Sam Hocevar committed
13
 *
Gildas Bazin's avatar
 
Gildas Bazin committed
14 15
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
16 17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU Lesser General Public License for more details.
Gildas Bazin's avatar
 
Gildas Bazin committed
18
 *
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
19 20 21
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
Gildas Bazin's avatar
 
Gildas Bazin committed
22 23 24 25 26
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/
27 28 29 30
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

31
#include <vlc_common.h>
32
#include <vlc_plugin.h>
Clément Stenac's avatar
Clément Stenac committed
33 34
#include <vlc_codec.h>
#include <vlc_sout.h>
Clément Stenac's avatar
Clément Stenac committed
35
#include <vlc_input.h>
36 37
#include "../demux/xiph.h"

Gildas Bazin's avatar
 
Gildas Bazin committed
38 39
#include <ogg/ogg.h>

40 41 42 43 44 45
#include <theora/codec.h>
#include <theora/theoradec.h>
#include <theora/theoraenc.h>

#include <assert.h>
#include <limits.h>
Gildas Bazin's avatar
 
Gildas Bazin committed
46 47

/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
48
 * decoder_sys_t : theora decoder descriptor
Gildas Bazin's avatar
 
Gildas Bazin committed
49
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
50
struct decoder_sys_t
Gildas Bazin's avatar
 
Gildas Bazin committed
51
{
Gildas Bazin's avatar
 
Gildas Bazin committed
52
    /* Module mode */
53
    bool b_packetizer;
Gildas Bazin's avatar
 
Gildas Bazin committed
54

Gildas Bazin's avatar
 
Gildas Bazin committed
55
    /*
Gildas Bazin's avatar
 
Gildas Bazin committed
56
     * Input properties
Gildas Bazin's avatar
 
Gildas Bazin committed
57
     */
58
    bool b_has_headers;
Gildas Bazin's avatar
 
Gildas Bazin committed
59 60 61 62

    /*
     * Theora properties
     */
63 64 65
    th_info          ti;       /* theora bitstream settings */
    th_comment       tc;       /* theora comment information */
    th_dec_ctx       *tcx;     /* theora decoder context */
Gildas Bazin's avatar
 
Gildas Bazin committed
66

67 68 69
    /*
     * Decoding properties
     */
70
    bool b_decoded_first_keyframe;
71

Gildas Bazin's avatar
 
Gildas Bazin committed
72 73 74 75 76
    /*
     * Common properties
     */
    mtime_t i_pts;
};
Gildas Bazin's avatar
 
Gildas Bazin committed
77 78 79 80

/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
81 82 83
static int  OpenDecoder   ( vlc_object_t * );
static int  OpenPacketizer( vlc_object_t * );
static void CloseDecoder  ( vlc_object_t * );
Gildas Bazin's avatar
 
Gildas Bazin committed
84

Gildas Bazin's avatar
 
Gildas Bazin committed
85
static void *DecodeBlock  ( decoder_t *, block_t ** );
86
static int  ProcessHeaders( decoder_t * );
Gildas Bazin's avatar
 
Gildas Bazin committed
87
static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** );
Gildas Bazin's avatar
 
Gildas Bazin committed
88

Gildas Bazin's avatar
 
Gildas Bazin committed
89
static picture_t *DecodePacket( decoder_t *, ogg_packet * );
Gildas Bazin's avatar
 
Gildas Bazin committed
90

Gildas Bazin's avatar
 
Gildas Bazin committed
91
static void ParseTheoraComments( decoder_t * );
92
static void theora_CopyPicture( picture_t *, th_ycbcr_buffer );
93

94
#ifdef ENABLE_SOUT
Gildas Bazin's avatar
 
Gildas Bazin committed
95 96 97
static int  OpenEncoder( vlc_object_t *p_this );
static void CloseEncoder( vlc_object_t *p_this );
static block_t *Encode( encoder_t *p_enc, picture_t *p_pict );
98
#endif
Gildas Bazin's avatar
 
Gildas Bazin committed
99

Gildas Bazin's avatar
 
Gildas Bazin committed
100 101 102
/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
103 104
#define ENC_QUALITY_TEXT N_("Encoding quality")
#define ENC_QUALITY_LONGTEXT N_( \
105
  "Enforce a quality between 1 (low) and 10 (high), instead " \
106 107
  "of specifying a particular bitrate. This will produce a VBR stream." )

108 109
#define ENC_POSTPROCESS_TEXT N_("Post processing quality")

110 111 112 113 114 115 116 117
vlc_module_begin ()
    set_category( CAT_INPUT )
    set_subcategory( SUBCAT_INPUT_VCODEC )
    set_shortname( "Theora" )
    set_description( N_("Theora video decoder") )
    set_capability( "decoder", 100 )
    set_callbacks( OpenDecoder, CloseDecoder )
    add_shortcut( "theora" )
118 119
#   define DEC_CFG_PREFIX "theora-"
    add_integer( DEC_CFG_PREFIX "postproc", -1, ENC_POSTPROCESS_TEXT, NULL, true )
120 121 122 123 124

    add_submodule ()
    set_description( N_("Theora video packetizer") )
    set_capability( "packetizer", 100 )
    set_callbacks( OpenPacketizer, CloseDecoder )
125
    add_shortcut( "theora" )
126

127
#ifdef ENABLE_SOUT
128 129 130 131
    add_submodule ()
    set_description( N_("Theora video encoder") )
    set_capability( "encoder", 150 )
    set_callbacks( OpenEncoder, CloseEncoder )
132
    add_shortcut( "theora" )
133 134

#   define ENC_CFG_PREFIX "sout-theora-"
135
    add_integer( ENC_CFG_PREFIX "quality", 2, ENC_QUALITY_TEXT,
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
136
                 ENC_QUALITY_LONGTEXT, false )
137
#endif
138
vlc_module_end ()
Gildas Bazin's avatar
 
Gildas Bazin committed
139

140
static const char *const ppsz_enc_options[] = {
141 142 143
    "quality", NULL
};

Gildas Bazin's avatar
 
Gildas Bazin committed
144 145 146 147 148
/*****************************************************************************
 * OpenDecoder: probe the decoder and return score
 *****************************************************************************/
static int OpenDecoder( vlc_object_t *p_this )
{
Gildas Bazin's avatar
 
Gildas Bazin committed
149
    decoder_t *p_dec = (decoder_t*)p_this;
Gildas Bazin's avatar
 
Gildas Bazin committed
150
    decoder_sys_t *p_sys;
Gildas Bazin's avatar
 
Gildas Bazin committed
151

152
    if( p_dec->fmt_in.i_codec != VLC_CODEC_THEORA )
Gildas Bazin's avatar
 
Gildas Bazin committed
153 154 155 156
    {
        return VLC_EGENERIC;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
157
    /* Allocate the memory needed to store the decoder's structure */
158
    if( ( p_dec->p_sys = p_sys = malloc(sizeof(*p_sys)) ) == NULL )
159
        return VLC_ENOMEM;
160
    p_dec->p_sys->b_packetizer = false;
161
    p_sys->b_has_headers = false;
162
    p_sys->i_pts = VLC_TS_INVALID;
163
    p_sys->b_decoded_first_keyframe = false;
164
    p_sys->tcx = NULL;
Gildas Bazin's avatar
 
Gildas Bazin committed
165 166 167

    /* Set output properties */
    p_dec->fmt_out.i_cat = VIDEO_ES;
168
    p_dec->fmt_out.i_codec = VLC_CODEC_I420;
Gildas Bazin's avatar
 
Gildas Bazin committed
169 170 171 172 173 174 175 176

    /* Set callbacks */
    p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **))
        DecodeBlock;
    p_dec->pf_packetize    = (block_t *(*)(decoder_t *, block_t **))
        DecodeBlock;

    /* Init supporting Theora structures needed in header parsing */
177 178
    th_comment_init( &p_sys->tc );
    th_info_init( &p_sys->ti );
Gildas Bazin's avatar
 
Gildas Bazin committed
179

Gildas Bazin's avatar
 
Gildas Bazin committed
180 181
    return VLC_SUCCESS;
}
Gildas Bazin's avatar
 
Gildas Bazin committed
182 183 184 185 186 187 188

static int OpenPacketizer( vlc_object_t *p_this )
{
    decoder_t *p_dec = (decoder_t*)p_this;

    int i_ret = OpenDecoder( p_this );

Gildas Bazin's avatar
 
Gildas Bazin committed
189 190
    if( i_ret == VLC_SUCCESS )
    {
191
        p_dec->p_sys->b_packetizer = true;
192
        p_dec->fmt_out.i_codec = VLC_CODEC_THEORA;
Gildas Bazin's avatar
 
Gildas Bazin committed
193
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
194 195 196 197 198

    return i_ret;
}

/****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
199
 * DecodeBlock: the whole thing
Gildas Bazin's avatar
 
Gildas Bazin committed
200 201 202
 ****************************************************************************
 * This function must be fed with ogg packets.
 ****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
203
static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
Gildas Bazin's avatar
 
Gildas Bazin committed
204 205
{
    decoder_sys_t *p_sys = p_dec->p_sys;
Gildas Bazin's avatar
 
Gildas Bazin committed
206
    block_t *p_block;
Gildas Bazin's avatar
 
Gildas Bazin committed
207
    ogg_packet oggpacket;
Gildas Bazin's avatar
 
Gildas Bazin committed
208 209 210 211

    if( !pp_block || !*pp_block ) return NULL;

    p_block = *pp_block;
Gildas Bazin's avatar
 
Gildas Bazin committed
212

Gildas Bazin's avatar
 
Gildas Bazin committed
213 214 215 216 217 218 219
    /* Block to Ogg packet */
    oggpacket.packet = p_block->p_buffer;
    oggpacket.bytes = p_block->i_buffer;
    oggpacket.granulepos = p_block->i_dts;
    oggpacket.b_o_s = 0;
    oggpacket.e_o_s = 0;
    oggpacket.packetno = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
220

221
    /* Check for headers */
222
    if( !p_sys->b_has_headers )
223
    {
224
        if( ProcessHeaders( p_dec ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
225
        {
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
226
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
227
            return NULL;
Gildas Bazin's avatar
 
Gildas Bazin committed
228
        }
229
        p_sys->b_has_headers = true;
230
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
231

232 233
    return ProcessPacket( p_dec, &oggpacket, pp_block );
}
Sam Hocevar's avatar
Sam Hocevar committed
234

235 236 237 238 239 240 241
/*****************************************************************************
 * ProcessHeaders: process Theora headers.
 *****************************************************************************/
static int ProcessHeaders( decoder_t *p_dec )
{
    decoder_sys_t *p_sys = p_dec->p_sys;
    ogg_packet oggpacket;
242
    th_setup_info *ts = NULL; /* theora setup information */
243
    int i_max_pp, i_pp;
Gildas Bazin's avatar
 
Gildas Bazin committed
244

245 246 247 248 249 250 251
    unsigned pi_size[XIPH_MAX_HEADER_COUNT];
    void     *pp_data[XIPH_MAX_HEADER_COUNT];
    unsigned i_count;
    if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
                           p_dec->fmt_in.i_extra, p_dec->fmt_in.p_extra) )
        return VLC_EGENERIC;
    if( i_count < 3 )
252
        return VLC_EGENERIC;
Gildas Bazin's avatar
 
Gildas Bazin committed
253

254 255 256 257 258
    oggpacket.granulepos = -1;
    oggpacket.e_o_s = 0;
    oggpacket.packetno = 0;

    /* Take care of the initial Vorbis header */
259 260 261
    oggpacket.b_o_s  = 1; /* yes this actually is a b_o_s packet :) */
    oggpacket.bytes  = pi_size[0];
    oggpacket.packet = pp_data[0];
262
    if( th_decode_headerin( &p_sys->ti, &p_sys->tc, &ts, &oggpacket ) < 0 )
Gildas Bazin's avatar
 
Gildas Bazin committed
263
    {
264
        msg_Err( p_dec, "this bitstream does not contain Theora video data" );
265
        goto error;
266
    }
Sam Hocevar's avatar
Sam Hocevar committed
267

268
    /* Set output properties */
269
    if( !p_sys->b_packetizer )
270 271

    switch( p_sys->ti.pixel_fmt )
272
    {
273
      case TH_PF_420:
274
        p_dec->fmt_out.i_codec = VLC_CODEC_I420;
275
        break;
276
      case TH_PF_422:
277
        p_dec->fmt_out.i_codec = VLC_CODEC_I422;
278
        break;
279
      case TH_PF_444:
280
        p_dec->fmt_out.i_codec = VLC_CODEC_I444;
281
        break;
282
      case TH_PF_RSVD:
283 284 285 286
      default:
        msg_Err( p_dec, "unknown chroma in theora sample" );
        break;
    }
287 288 289 290

    p_dec->fmt_out.video.i_width = p_sys->ti.frame_width;
    p_dec->fmt_out.video.i_height = p_sys->ti.frame_height;
    if( p_sys->ti.pic_width && p_sys->ti.pic_height )
291
    {
292 293 294 295
        p_dec->fmt_out.video.i_visible_width = p_sys->ti.pic_width;
        p_dec->fmt_out.video.i_visible_height = p_sys->ti.pic_height;

        if( p_sys->ti.pic_x || p_sys->ti.pic_y )
296
        {
297 298
            p_dec->fmt_out.video.i_x_offset = p_sys->ti.pic_x;
            p_dec->fmt_out.video.i_y_offset = p_sys->ti.pic_y;
299
        }
300
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
301

302 303
    if( p_sys->ti.aspect_denominator && p_sys->ti.aspect_numerator )
    {
304 305
        p_dec->fmt_out.video.i_sar_num = p_sys->ti.aspect_numerator;
        p_dec->fmt_out.video.i_sar_den = p_sys->ti.aspect_denominator;
Gildas Bazin's avatar
 
Gildas Bazin committed
306
    }
307 308
    else
    {
309 310
        p_dec->fmt_out.video.i_sar_num = 1;
        p_dec->fmt_out.video.i_sar_den = 1;
311 312
    }

313 314 315 316 317 318
    if( p_sys->ti.fps_numerator > 0 && p_sys->ti.fps_denominator > 0 )
    {
        p_dec->fmt_out.video.i_frame_rate = p_sys->ti.fps_numerator;
        p_dec->fmt_out.video.i_frame_rate_base = p_sys->ti.fps_denominator;
    }

319 320 321
    msg_Dbg( p_dec, "%dx%d %.02f fps video, frame content "
             "is %dx%d with offset (%d,%d)",
             p_sys->ti.frame_width, p_sys->ti.frame_height,
322 323 324 325 326 327 328 329 330 331 332
             (double)p_sys->ti.fps_numerator/p_sys->ti.fps_denominator,
             p_sys->ti.pic_width, p_sys->ti.pic_height,
             p_sys->ti.pic_x, p_sys->ti.pic_y );

    /* Some assertions based on the documentation.  These are mandatory restrictions. */
    assert( p_sys->ti.frame_height % 16 == 0 && p_sys->ti.frame_height < 1048576 );
    assert( p_sys->ti.frame_width % 16 == 0 && p_sys->ti.frame_width < 1048576 );
    assert( p_sys->ti.keyframe_granule_shift >= 0 && p_sys->ti.keyframe_granule_shift <= 31 );
    assert( p_sys->ti.pic_x <= __MIN( p_sys->ti.frame_width - p_sys->ti.pic_width, 255 ) );
    assert( p_sys->ti.pic_y <= p_sys->ti.frame_height - p_sys->ti.pic_height);
    assert( p_sys->ti.frame_height - p_sys->ti.pic_height - p_sys->ti.pic_y <= 255 );
Gildas Bazin's avatar
 
Gildas Bazin committed
333

334
    /* Sanity check that seems necessary for some corrupted files */
335 336
    if( p_sys->ti.frame_width < p_sys->ti.pic_width ||
        p_sys->ti.frame_height < p_sys->ti.pic_height )
337 338 339
    {
        msg_Warn( p_dec, "trying to correct invalid theora header "
                  "(frame size (%dx%d) is smaller than frame content (%d,%d))",
340 341
                  p_sys->ti.frame_width, p_sys->ti.frame_height,
                  p_sys->ti.pic_width, p_sys->ti.pic_height );
342

343 344 345 346
        if( p_sys->ti.frame_width < p_sys->ti.pic_width )
          p_sys->ti.frame_width = p_sys->ti.pic_width;
        if( p_sys->ti.frame_height < p_sys->ti.pic_height )
            p_sys->ti.frame_height = p_sys->ti.pic_height;
347 348
    }

349
    /* The next packet in order is the comments header */
350 351 352
    oggpacket.b_o_s  = 0;
    oggpacket.bytes  = pi_size[1];
    oggpacket.packet = pp_data[1];
353 354

    if( th_decode_headerin( &p_sys->ti, &p_sys->tc, &ts, &oggpacket ) < 0 )
355 356
    {
        msg_Err( p_dec, "2nd Theora header is corrupted" );
357
        goto error;
358 359 360
    }

    ParseTheoraComments( p_dec );
Gildas Bazin's avatar
 
Gildas Bazin committed
361

362 363 364
    /* The next packet in order is the codebooks header
     * We need to watch out that this packet is not missing as a
     * missing or corrupted header is fatal. */
365 366 367
    oggpacket.b_o_s  = 0;
    oggpacket.bytes  = pi_size[2];
    oggpacket.packet = pp_data[2];
368
    if( th_decode_headerin( &p_sys->ti, &p_sys->tc, &ts, &oggpacket ) < 0 )
369 370
    {
        msg_Err( p_dec, "3rd Theora header is corrupted" );
371
        goto error;
372 373 374 375 376
    }

    if( !p_sys->b_packetizer )
    {
        /* We have all the headers, initialize decoder */
377 378 379 380 381
        if ( ( p_sys->tcx = th_decode_alloc( &p_sys->ti, ts ) ) == NULL )
        {
            msg_Err( p_dec, "Could not allocate Theora decoder" );
            goto error;
        }
382 383 384 385 386 387 388 389 390 391 392 393 394 395 396

        i_pp = var_InheritInteger( p_dec, DEC_CFG_PREFIX "postproc" );
        if ( i_pp >= 0 && !th_decode_ctl( p_sys->tcx,
                    TH_DECCTL_GET_PPLEVEL_MAX, &i_max_pp, sizeof(int) ) )
        {
            i_pp = __MIN( i_pp, i_max_pp );
            if ( th_decode_ctl( p_sys->tcx, TH_DECCTL_SET_PPLEVEL,
                                &i_pp, sizeof(int) ) )
                msg_Err( p_dec, "Failed to set post processing level to %d",
                         i_pp );
            else
                msg_Dbg( p_dec, "Set post processing level to %d / %d",
                         i_pp, i_max_pp );
        }

397 398 399 400
    }
    else
    {
        p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra;
401
        p_dec->fmt_out.p_extra = xrealloc( p_dec->fmt_out.p_extra,
402
                                                  p_dec->fmt_out.i_extra );
403 404 405 406
        memcpy( p_dec->fmt_out.p_extra,
                p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra );
    }

407 408
    /* Clean up the decoder setup info... we're done with it */
    th_setup_free( ts );
409
    return VLC_SUCCESS;
410 411

error:
412 413
    /* Clean up the decoder setup info... we're done with it */
    th_setup_free( ts );
414
    return VLC_EGENERIC;
Gildas Bazin's avatar
 
Gildas Bazin committed
415
}
Gildas Bazin's avatar
 
Gildas Bazin committed
416

Gildas Bazin's avatar
 
Gildas Bazin committed
417
/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
418
 * ProcessPacket: processes a theora packet.
Gildas Bazin's avatar
 
Gildas Bazin committed
419
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
420 421
static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
                            block_t **pp_block )
Gildas Bazin's avatar
 
Gildas Bazin committed
422 423
{
    decoder_sys_t *p_sys = p_dec->p_sys;
Gildas Bazin's avatar
 
Gildas Bazin committed
424 425
    block_t *p_block = *pp_block;
    void *p_buf;
Gildas Bazin's avatar
 
Gildas Bazin committed
426

Laurent Aimar's avatar
Laurent Aimar committed
427
    if( ( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) != 0 )
428 429 430 431
    {
        /* Don't send the the first packet after a discontinuity to
         * theora_decode, otherwise we get purple/green display artifacts
         * appearing in the video output */
432
        block_Release(p_block);
433 434 435
        return NULL;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
436
    /* Date management */
437
    if( p_block->i_pts > VLC_TS_INVALID && p_block->i_pts != p_sys->i_pts )
Gildas Bazin's avatar
 
Gildas Bazin committed
438
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
439
        p_sys->i_pts = p_block->i_pts;
Gildas Bazin's avatar
 
Gildas Bazin committed
440 441
    }

442 443
    *pp_block = NULL; /* To avoid being fed the same packet again */

Gildas Bazin's avatar
 
Gildas Bazin committed
444 445
    if( p_sys->b_packetizer )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
446 447 448
        /* Date management */
        p_block->i_dts = p_block->i_pts = p_sys->i_pts;

449
        p_block->i_length = p_sys->i_pts - p_block->i_pts;
Gildas Bazin's avatar
 
Gildas Bazin committed
450 451

        p_buf = p_block;
Gildas Bazin's avatar
 
Gildas Bazin committed
452 453 454
    }
    else
    {
455
        p_buf = DecodePacket( p_dec, p_oggpacket );
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
456
        block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
457
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
458 459

    /* Date management */
Tristan Matthews's avatar
Tristan Matthews committed
460
    p_sys->i_pts += ( CLOCK_FREQ * p_sys->ti.fps_denominator /
Gildas Bazin's avatar
 
Gildas Bazin committed
461
                      p_sys->ti.fps_numerator ); /* 1 frame per packet */
Gildas Bazin's avatar
 
Gildas Bazin committed
462

Gildas Bazin's avatar
 
Gildas Bazin committed
463
    return p_buf;
Gildas Bazin's avatar
 
Gildas Bazin committed
464 465 466
}

/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
467
 * DecodePacket: decodes a Theora packet.
Gildas Bazin's avatar
 
Gildas Bazin committed
468
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
469
static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
Gildas Bazin's avatar
 
Gildas Bazin committed
470
{
Gildas Bazin's avatar
 
Gildas Bazin committed
471
    decoder_sys_t *p_sys = p_dec->p_sys;
Gildas Bazin's avatar
 
Gildas Bazin committed
472
    picture_t *p_pic;
473
    th_ycbcr_buffer ycbcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
474

475 476
    /* TODO: Implement _granpos (3rd parameter here) and add the
     * call to TH_DECCTL_SET_GRANDPOS after seek */
.'s avatar
. committed
477 478 479
    /* TODO: If the return is TH_DUPFRAME, we don't need to display a new
     * frame, but we do need to keep displaying the previous one. */
    if (th_decode_packetin( p_sys->tcx, p_oggpacket, NULL ) < 0)
480
        return NULL; /* bad packet */
Gildas Bazin's avatar
 
Gildas Bazin committed
481

482 483 484
    /* Check for keyframe */
    if( !(p_oggpacket->packet[0] & 0x80) /* data packet */ &&
        !(p_oggpacket->packet[0] & 0x40) /* intra frame */ )
485
        p_sys->b_decoded_first_keyframe = true;
486 487 488 489 490 491

    /* If we haven't seen a single keyframe yet, don't let Theora decode
     * anything, otherwise we'll get display artifacts.  (This is impossible
     * in the general case, but can happen if e.g. we play a network stream
     * using a timed URL, such that the server doesn't start the video with a
     * keyframe). */
492 493 494 495
    if( !p_sys->b_decoded_first_keyframe )
        return NULL; /* Wait until we've decoded the first keyframe */

    if( th_decode_ycbcr_out( p_sys->tcx, ycbcr ) ) /* returns 0 on success */
496
        return NULL;
Gildas Bazin's avatar
 
Gildas Bazin committed
497

Gildas Bazin's avatar
 
Gildas Bazin committed
498
    /* Get a new picture */
499
    p_pic = decoder_NewPicture( p_dec );
Gildas Bazin's avatar
 
Gildas Bazin committed
500
    if( !p_pic ) return NULL;
Gildas Bazin's avatar
 
Gildas Bazin committed
501

502
    theora_CopyPicture( p_pic, ycbcr );
Gildas Bazin's avatar
 
Gildas Bazin committed
503

Gildas Bazin's avatar
 
Gildas Bazin committed
504
    p_pic->date = p_sys->i_pts;
Gildas Bazin's avatar
 
Gildas Bazin committed
505

Gildas Bazin's avatar
 
Gildas Bazin committed
506
    return p_pic;
Gildas Bazin's avatar
 
Gildas Bazin committed
507 508 509
}

/*****************************************************************************
510
 * ParseTheoraComments:
Gildas Bazin's avatar
 
Gildas Bazin committed
511
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
512
static void ParseTheoraComments( decoder_t *p_dec )
Gildas Bazin's avatar
 
Gildas Bazin committed
513
{
Gildas Bazin's avatar
 
Gildas Bazin committed
514
    char *psz_name, *psz_value, *psz_comment;
515
    int i = 0;
516 517 518 519 520 521 522 523 524 525 526 527 528 529 530
    /* Regarding the th_comment structure: */

    /* The metadata is stored as a series of (tag, value) pairs, in
       length-encoded string vectors. The first occurrence of the '='
       character delimits the tag and value. A particular tag may
       occur more than once, and order is significant. The character
       set encoding for the strings is always UTF-8, but the tag names
       are limited to ASCII, and treated as case-insensitive. See the
       Theora specification, Section 6.3.3 for details. */

    /* In filling in this structure, th_decode_headerin() will
       null-terminate the user_comment strings for safety. However,
       the bitstream format itself treats them as 8-bit clean vectors,
       possibly containing null characters, and so the length array
       should be treated as their authoritative length. */
Gildas Bazin's avatar
 
Gildas Bazin committed
531
    while ( i < p_dec->p_sys->tc.comments )
Gildas Bazin's avatar
 
Gildas Bazin committed
532
    {
533 534 535
        int clen = p_dec->p_sys->tc.comment_lengths[i];
        if ( clen <= 0 || clen >= INT_MAX ) { i++; continue; }
        psz_comment = (char *)malloc( clen + 1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
536 537
        if( !psz_comment )
            break;
538
        memcpy( (void*)psz_comment, (void*)p_dec->p_sys->tc.user_comments[i], clen + 1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
539 540 541 542 543 544
        psz_name = psz_comment;
        psz_value = strchr( psz_comment, '=' );
        if( psz_value )
        {
            *psz_value = '\0';
            psz_value++;
545 546 547

            if( !p_dec->p_description )
                p_dec->p_description = vlc_meta_New();
548 549
            /* TODO:  Since psz_value can contain NULLs see if there is an
             * instance where we need to preserve the full length of this string */
550 551
            if( p_dec->p_description )
                vlc_meta_AddExtra( p_dec->p_description, psz_name, psz_value );
Gildas Bazin's avatar
 
Gildas Bazin committed
552 553 554 555 556 557 558
        }
        free( psz_comment );
        i++;
    }
}

/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
559
 * CloseDecoder: theora decoder destruction
Gildas Bazin's avatar
 
Gildas Bazin committed
560
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
561
static void CloseDecoder( vlc_object_t *p_this )
Gildas Bazin's avatar
 
Gildas Bazin committed
562
{
Gildas Bazin's avatar
 
Gildas Bazin committed
563
    decoder_t *p_dec = (decoder_t *)p_this;
Gildas Bazin's avatar
 
Gildas Bazin committed
564
    decoder_sys_t *p_sys = p_dec->p_sys;
Gildas Bazin's avatar
 
Gildas Bazin committed
565

566 567 568
    th_info_clear(&p_sys->ti);
    th_comment_clear(&p_sys->tc);
    th_decode_free(p_sys->tcx);
Gildas Bazin's avatar
 
Gildas Bazin committed
569
    free( p_sys );
Gildas Bazin's avatar
 
Gildas Bazin committed
570 571 572 573 574 575
}

/*****************************************************************************
 * theora_CopyPicture: copy a picture from theora internal buffers to a
 *                     picture_t structure.
 *****************************************************************************/
576
static void theora_CopyPicture( picture_t *p_pic,
577
                                th_ycbcr_buffer ycbcr )
Gildas Bazin's avatar
 
Gildas Bazin committed
578
{
579
    int i_plane, i_planes, i_line, i_dst_stride, i_src_stride;
Sam Hocevar's avatar
Sam Hocevar committed
580
    uint8_t *p_dst, *p_src;
581 582 583 584 585 586 587 588 589
    /* th_img_plane
       int  width   The width of this plane.
       int  height  The height of this plane.
       int  stride  The offset in bytes between successive rows.
       unsigned char *data  A pointer to the beginning of the first row.

       Detailed Description

       A buffer for a single color plane in an uncompressed image.
Gildas Bazin's avatar
 
Gildas Bazin committed
590

591 592 593 594 595 596 597 598 599 600 601 602 603
       This contains the image data in a left-to-right, top-down
       format. Each row of pixels is stored contiguously in memory,
       but successive rows need not be. Use stride to compute the
       offset of the next row. The encoder accepts both positive
       stride values (top-down in memory) and negative (bottom-up in
       memory). The decoder currently always generates images with
       positive strides.

       typedef th_img_plane th_ycbcr_buffer[3]
    */

    i_planes = p_pic->i_planes < 3 ? p_pic->i_planes : 3;
    for( i_plane = 0; i_plane < i_planes; i_plane++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
604 605
    {
        p_dst = p_pic->p[i_plane].p_pixels;
606
        p_src = ycbcr[i_plane].data;
Gildas Bazin's avatar
 
Gildas Bazin committed
607
        i_dst_stride  = p_pic->p[i_plane].i_pitch;
608 609 610 611
        i_src_stride  = ycbcr[i_plane].stride;
        for( i_line = 0;
             i_line < __MIN(p_pic->p[i_plane].i_lines, ycbcr[i_plane].height);
             i_line++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
612
        {
Rafaël Carré's avatar
Rafaël Carré committed
613
            memcpy( p_dst, p_src, ycbcr[i_plane].width );
Gildas Bazin's avatar
 
Gildas Bazin committed
614 615 616 617 618
            p_src += i_src_stride;
            p_dst += i_dst_stride;
        }
    }
}
Gildas Bazin's avatar
 
Gildas Bazin committed
619

620
#ifdef ENABLE_SOUT
Gildas Bazin's avatar
 
Gildas Bazin committed
621 622 623 624 625 626 627 628
/*****************************************************************************
 * encoder_sys_t : theora encoder descriptor
 *****************************************************************************/
struct encoder_sys_t
{
    /*
     * Input properties
     */
629
    bool b_headers;
Gildas Bazin's avatar
 
Gildas Bazin committed
630 631 632 633

    /*
     * Theora properties
     */
634 635 636
    th_info      ti;                     /* theora bitstream settings */
    th_comment   tc;                     /* theora comment header */
    th_enc_ctx   *tcx;                   /* theora context */
Gildas Bazin's avatar
 
Gildas Bazin committed
637 638 639 640 641 642 643 644
};

/*****************************************************************************
 * OpenEncoder: probe the encoder and return score
 *****************************************************************************/
static int OpenEncoder( vlc_object_t *p_this )
{
    encoder_t *p_enc = (encoder_t *)p_this;
645
    encoder_sys_t *p_sys;
Laurent Aimar's avatar
Laurent Aimar committed
646
    int i_quality;
647 648 649 650 651
    int t_flags;
    int max_enc_level = 0;
    int keyframe_freq_force = 64;
    ogg_packet header;
    int status;
Gildas Bazin's avatar
 
Gildas Bazin committed
652

653
    if( p_enc->fmt_out.i_codec != VLC_CODEC_THEORA &&
654
        !p_enc->b_force )
Gildas Bazin's avatar
 
Gildas Bazin committed
655 656 657 658 659
    {
        return VLC_EGENERIC;
    }

    /* Allocate the memory needed to store the decoder's structure */
660
    if( ( p_sys = malloc(sizeof(encoder_sys_t)) ) == NULL )
661
        return VLC_ENOMEM;
Gildas Bazin's avatar
 
Gildas Bazin committed
662 663 664
    p_enc->p_sys = p_sys;

    p_enc->pf_encode_video = Encode;
665 666
    p_enc->fmt_in.i_codec = VLC_CODEC_I420;
    p_enc->fmt_out.i_codec = VLC_CODEC_THEORA;
Gildas Bazin's avatar
 
Gildas Bazin committed
667

668
    config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
669

670
    i_quality = var_GetInteger( p_enc, ENC_CFG_PREFIX "quality" );
671 672 673
    if( i_quality > 10 ) i_quality = 10;
    if( i_quality < 0 ) i_quality = 0;

674
    th_info_init( &p_sys->ti );
Gildas Bazin's avatar
 
Gildas Bazin committed
675

676 677
    p_sys->ti.frame_width = p_enc->fmt_in.video.i_visible_width;
    p_sys->ti.frame_height = p_enc->fmt_in.video.i_visible_height;
678

679
    if( p_sys->ti.frame_width % 16 || p_sys->ti.frame_height % 16 )
680 681 682
    {
        /* Pictures from the transcoder should always have a pitch
         * which is a multiple of 16 */
683 684
        p_sys->ti.frame_width = (p_sys->ti.frame_width + 15) >> 4 << 4;
        p_sys->ti.frame_height = (p_sys->ti.frame_height + 15) >> 4 << 4;
685 686

        msg_Dbg( p_enc, "padding video from %dx%d to %dx%d",
687
                 p_enc->fmt_in.video.i_visible_width, p_enc->fmt_in.video.i_visible_height,
688
                 p_sys->ti.frame_width, p_sys->ti.frame_height );
689 690
    }

691 692
    p_sys->ti.pic_width = p_enc->fmt_in.video.i_visible_width;
    p_sys->ti.pic_height = p_enc->fmt_in.video.i_visible_height;
693 694
    p_sys->ti.pic_x = 0 /*frame_x_offset*/;
    p_sys->ti.pic_y = 0 /*frame_y_offset*/;
695 696 697 698 699 700 701 702 703 704 705 706

    if( !p_enc->fmt_in.video.i_frame_rate ||
        !p_enc->fmt_in.video.i_frame_rate_base )
    {
        p_sys->ti.fps_numerator = 25;
        p_sys->ti.fps_denominator = 1;
    }
    else
    {
        p_sys->ti.fps_numerator = p_enc->fmt_in.video.i_frame_rate;
        p_sys->ti.fps_denominator = p_enc->fmt_in.video.i_frame_rate_base;
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
707

708
    if( p_enc->fmt_in.video.i_sar_num > 0 && p_enc->fmt_in.video.i_sar_den > 0 )
Gildas Bazin's avatar
 
Gildas Bazin committed
709
    {
710
        unsigned i_dst_num, i_dst_den;
711 712 713
        vlc_ureduce( &i_dst_num, &i_dst_den,
                     p_enc->fmt_in.video.i_sar_num,
                     p_enc->fmt_in.video.i_sar_den, 0 );
714 715
        p_sys->ti.aspect_numerator = i_dst_num;
        p_sys->ti.aspect_denominator = i_dst_den;
Gildas Bazin's avatar
 
Gildas Bazin committed
716 717 718 719 720 721 722
    }
    else
    {
        p_sys->ti.aspect_numerator = 4;
        p_sys->ti.aspect_denominator = 3;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
723
    p_sys->ti.target_bitrate = p_enc->fmt_out.i_bitrate;
724
    p_sys->ti.quality = ((float)i_quality) * 6.3f;
Gildas Bazin's avatar
 
Gildas Bazin committed
725

726 727 728 729 730 731

    p_sys->tcx = th_encode_alloc( &p_sys->ti );
    th_comment_init( &p_sys->tc );

    /* These are no longer supported here: */
    /*
Gildas Bazin's avatar
 
Gildas Bazin committed
732 733 734 735 736
    p_sys->ti.dropframes_p = 0;
    p_sys->ti.quick_p = 1;
    p_sys->ti.keyframe_auto_p = 1;
    p_sys->ti.keyframe_frequency = 64;
    p_sys->ti.keyframe_frequency_force = 64;
Gildas Bazin's avatar
 
Gildas Bazin committed
737
    p_sys->ti.keyframe_data_target_bitrate = p_enc->fmt_out.i_bitrate * 1.5;
Gildas Bazin's avatar
 
Gildas Bazin committed
738 739 740
    p_sys->ti.keyframe_auto_threshold = 80;
    p_sys->ti.keyframe_mindistance = 8;
    p_sys->ti.noise_sensitivity = 1;
741
    */
Gildas Bazin's avatar
 
Gildas Bazin committed
742

743 744 745
    t_flags = TH_RATECTL_CAP_OVERFLOW; /* default is TH_RATECTL_CAP_OVERFLOW | TL_RATECTL_DROP_FRAMES */
    /* Turn off dropframes */
    th_encode_ctl( p_sys->tcx, TH_ENCCTL_SET_RATE_FLAGS, &t_flags, sizeof(t_flags) );
Gildas Bazin's avatar
 
Gildas Bazin committed
746

747 748 749 750
    /* turn on fast encoding */
    if ( !th_encode_ctl( p_sys->tcx, TH_ENCCTL_GET_SPLEVEL_MAX, &max_enc_level,
                sizeof(max_enc_level) ) ) /* returns 0 on success */
        th_encode_ctl( p_sys->tcx, TH_ENCCTL_SET_SPLEVEL, &max_enc_level, sizeof(max_enc_level) );
751

752 753 754
    /* Set forced distance between key frames */
    th_encode_ctl( p_sys->tcx, TH_ENCCTL_SET_KEYFRAME_FREQUENCY_FORCE,
                   &keyframe_freq_force, sizeof(keyframe_freq_force) );
755

756 757 758 759
    /* Create and store headers */
    while ( ( status = th_encode_flushheader( p_sys->tcx, &p_sys->tc, &header ) ) )
    {
        if ( status < 0 ) return VLC_EGENERIC;
Laurent Aimar's avatar
Laurent Aimar committed
760 761 762 763 764 765
        if( xiph_AppendHeaders( &p_enc->fmt_out.i_extra, &p_enc->fmt_out.p_extra,
                                header.bytes, header.packet ) )
        {
            p_enc->fmt_out.i_extra = 0;
            p_enc->fmt_out.p_extra = NULL;
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
766
    }
767
    return VLC_SUCCESS;
Gildas Bazin's avatar
 
Gildas Bazin committed
768 769 770 771 772 773 774 775 776 777 778 779
}

/****************************************************************************
 * Encode: the whole thing
 ****************************************************************************
 * This function spits out ogg packets.
 ****************************************************************************/
static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
{
    encoder_sys_t *p_sys = p_enc->p_sys;
    ogg_packet oggpacket;
    block_t *p_block;
780
    th_ycbcr_buffer ycbcr;
Tristan Matthews's avatar
Tristan Matthews committed
781
    unsigned i;
782

783
    if( !p_pict ) return NULL;
784
    /* Sanity check */
Tristan Matthews's avatar
Tristan Matthews committed
785 786
    if( p_pict->p[0].i_pitch < (int)p_sys->ti.frame_width ||
        p_pict->p[0].i_lines < (int)p_sys->ti.frame_height )
787 788 789 790
    {
        msg_Warn( p_enc, "frame is smaller than encoding size"
                  "(%ix%i->%ix%i) -> dropping frame",
                  p_pict->p[0].i_pitch, p_pict->p[0].i_lines,
Tristan Matthews's avatar
Tristan Matthews committed
791
                  p_sys->ti.frame_width, p_sys->ti.frame_height );
792 793 794 795
        return NULL;
    }

    /* Fill padding */
Tristan Matthews's avatar
Tristan Matthews committed
796
    if( p_pict->p[0].i_visible_pitch < (int)p_sys->ti.frame_width )
797
    {
Tristan Matthews's avatar
Tristan Matthews committed
798
        for( i = 0; i < p_sys->ti.frame_height; i++ )
799 800 801 802 803
        {
            memset( p_pict->p[0].p_pixels + i * p_pict->p[0].i_pitch +
                    p_pict->p[0].i_visible_pitch,
                    *( p_pict->p[0].p_pixels + i * p_pict->p[0].i_pitch +
                       p_pict->p[0].i_visible_pitch - 1 ),
Tristan Matthews's avatar
Tristan Matthews committed
804
                    p_sys->ti.frame_width - p_pict->p[0].i_visible_pitch );
805
        }
Tristan Matthews's avatar
Tristan Matthews committed
806
        for( i = 0; i < p_sys->ti.frame_height / 2; i++ )
807 808 809 810 811
        {
            memset( p_pict->p[1].p_pixels + i * p_pict->p[1].i_pitch +
                    p_pict->p[1].i_visible_pitch,
                    *( p_pict->p[1].p_pixels + i * p_pict->p[1].i_pitch +
                       p_pict->p[1].i_visible_pitch - 1 ),
Tristan Matthews's avatar
Tristan Matthews committed
812
                    p_sys->ti.frame_width / 2 - p_pict->p[1].i_visible_pitch );
813 814 815 816
            memset( p_pict->p[2].p_pixels + i * p_pict->p[2].i_pitch +
                    p_pict->p[2].i_visible_pitch,
                    *( p_pict->p[2].p_pixels + i * p_pict->p[2].i_pitch +
                       p_pict->p[2].i_visible_pitch - 1 ),
Tristan Matthews's avatar
Tristan Matthews committed
817
                    p_sys->ti.frame_width / 2 - p_pict->p[2].i_visible_pitch );
818 819 820
        }
    }

Tristan Matthews's avatar
Tristan Matthews committed
821
    if( p_pict->p[0].i_visible_lines < (int)p_sys->ti.frame_height )
822
    {
Tristan Matthews's avatar
Tristan Matthews committed
823
        for( i = p_pict->p[0].i_visible_lines; i < p_sys->ti.frame_height; i++ )
824 825
        {
            memset( p_pict->p[0].p_pixels + i * p_pict->p[0].i_pitch, 0,
Tristan Matthews's avatar
Tristan Matthews committed
826
                    p_sys->ti.frame_width );
827
        }
Tristan Matthews's avatar
Tristan Matthews committed
828
        for( i = p_pict->p[1].i_visible_lines; i < p_sys->ti.frame_height / 2; i++ )
829 830
        {
            memset( p_pict->p[1].p_pixels + i * p_pict->p[1].i_pitch, 0x80,
Tristan Matthews's avatar
Tristan Matthews committed
831
                    p_sys->ti.frame_width / 2 );
832
            memset( p_pict->p[2].p_pixels + i * p_pict->p[2].i_pitch, 0x80,
Tristan Matthews's avatar
Tristan Matthews committed
833
                    p_sys->ti.frame_width / 2 );
834 835
        }
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
836 837 838 839

    /* Theora is a one-frame-in, one-frame-out system. Submit a frame
     * for compression and pull out the packet. */

Tristan Matthews's avatar
Tristan Matthews committed
840 841
    ycbcr[0].width = p_sys->ti.frame_width;
    ycbcr[0].height = p_sys->ti.frame_height;
842 843
    ycbcr[0].stride = p_pict->p[0].i_pitch;
    ycbcr[0].data = p_pict->p[0].p_pixels;
Gildas Bazin's avatar
 
Gildas Bazin committed
844

Tristan Matthews's avatar
Tristan Matthews committed
845 846
    ycbcr[1].width = p_sys->ti.frame_width / 2;
    ycbcr[1].height = p_sys->ti.frame_height / 2;
847 848
    ycbcr[1].stride = p_pict->p[1].i_pitch;
    ycbcr[1].data = p_pict->p[1].p_pixels;
Gildas Bazin's avatar
 
Gildas Bazin committed
849

Tristan Matthews's avatar
Tristan Matthews committed
850 851
    ycbcr[2].width = p_sys->ti.frame_width / 2;
    ycbcr[2].height = p_sys->ti.frame_height / 2;
852 853
    ycbcr[2].stride = p_pict->p[1].i_pitch;
    ycbcr[2].data = p_pict->p[2].p_pixels;
Gildas Bazin's avatar
 
Gildas Bazin committed
854

855
    if( th_encode_ycbcr_in( p_sys->tcx, ycbcr ) < 0 )
Gildas Bazin's avatar
 
Gildas Bazin committed
856 857 858 859
    {
        msg_Warn( p_enc, "failed encoding a frame" );
        return NULL;
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
860

861
    th_encode_packetout( p_sys->tcx, 0, &oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
862 863

    /* Ogg packet to block */
864
    p_block = block_Alloc( oggpacket.bytes );
Gildas Bazin's avatar
 
Gildas Bazin committed
865
    memcpy( p_block->p_buffer, oggpacket.packet, oggpacket.bytes );
866
    p_block->i_dts = p_block->i_pts = p_pict->date;
Gildas Bazin's avatar
 
Gildas Bazin committed
867

868
    if( th_packet_iskeyframe( &oggpacket ) )
ogg.k.ogg.k's avatar
ogg.k.ogg.k committed
869 870 871 872
    {
        p_block->i_flags |= BLOCK_FLAG_TYPE_I;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
873 874 875 876 877 878 879 880 881 882 883
    return p_block;
}

/*****************************************************************************
 * CloseEncoder: theora encoder destruction
 *****************************************************************************/
static void CloseEncoder( vlc_object_t *p_this )
{
    encoder_t *p_enc = (encoder_t *)p_this;
    encoder_sys_t *p_sys = p_enc->p_sys;

884 885 886
    th_info_clear(&p_sys->ti);
    th_comment_clear(&p_sys->tc);
    th_encode_free(p_sys->tcx);
Gildas Bazin's avatar
 
Gildas Bazin committed
887 888
    free( p_sys );
}
889
#endif