| OLD | NEW |
| 1 /* | 1 /* |
| 2 * The copyright in this software is being made available under the 2-clauses | 2 * The copyright in this software is being made available under the 2-clauses |
| 3 * BSD License, included below. This software may be subject to other third | 3 * BSD License, included below. This software may be subject to other third |
| 4 * party and contributor rights, including patent rights, and no such rights | 4 * party and contributor rights, including patent rights, and no such rights |
| 5 * are granted under this license. | 5 * are granted under this license. |
| 6 * | 6 * |
| 7 * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium | 7 * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium |
| 8 * Copyright (c) 2002-2014, Professor Benoit Macq | 8 * Copyright (c) 2002-2014, Professor Benoit Macq |
| 9 * Copyright (c) 2001-2003, David Janssens | 9 * Copyright (c) 2001-2003, David Janssens |
| 10 * Copyright (c) 2002-2003, Yannick Verschueren | 10 * Copyright (c) 2002-2003, Yannick Verschueren |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 OPJ_UINT32 ppt : 1; | 297 OPJ_UINT32 ppt : 1; |
| 298 /** indicates if a POC marker has been used O:NO, 1:YES */ | 298 /** indicates if a POC marker has been used O:NO, 1:YES */ |
| 299 OPJ_UINT32 POC : 1; | 299 OPJ_UINT32 POC : 1; |
| 300 } opj_tcp_t; | 300 } opj_tcp_t; |
| 301 | 301 |
| 302 | 302 |
| 303 | 303 |
| 304 | 304 |
| 305 typedef struct opj_encoding_param | 305 typedef struct opj_encoding_param |
| 306 { | 306 { |
| 307 /** Digital cinema profile*/ | |
| 308 OPJ_CINEMA_MODE m_cinema; | |
| 309 /** Maximum rate for each component. If == 0, component size limitation
is not considered */ | 307 /** Maximum rate for each component. If == 0, component size limitation
is not considered */ |
| 310 OPJ_UINT32 m_max_comp_size; | 308 OPJ_UINT32 m_max_comp_size; |
| 311 /** Position of tile part flag in progression order*/ | 309 /** Position of tile part flag in progression order*/ |
| 312 OPJ_INT32 m_tp_pos; | 310 OPJ_INT32 m_tp_pos; |
| 313 /** fixed layer */ | 311 /** fixed layer */ |
| 314 OPJ_INT32 *m_matrice; | 312 OPJ_INT32 *m_matrice; |
| 315 /** Flag determining tile part generation*/ | 313 /** Flag determining tile part generation*/ |
| 316 OPJ_BYTE m_tp_flag; | 314 OPJ_BYTE m_tp_flag; |
| 317 /** allocation by rate/distortion */ | 315 /** allocation by rate/distortion */ |
| 318 OPJ_UINT32 m_disto_alloc : 1; | 316 OPJ_UINT32 m_disto_alloc : 1; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 336 | 334 |
| 337 | 335 |
| 338 /** | 336 /** |
| 339 * Coding parameters | 337 * Coding parameters |
| 340 */ | 338 */ |
| 341 typedef struct opj_cp | 339 typedef struct opj_cp |
| 342 { | 340 { |
| 343 /** Size of the image in bits*/ | 341 /** Size of the image in bits*/ |
| 344 /*int img_size;*/ | 342 /*int img_size;*/ |
| 345 /** Rsiz*/ | 343 /** Rsiz*/ |
| 346 » OPJ_RSIZ_CAPABILITIES rsiz; | 344 OPJ_UINT16 rsiz; |
| 347 /** XTOsiz */ | 345 /** XTOsiz */ |
| 348 OPJ_UINT32 tx0; /* MSD see norm */ | 346 OPJ_UINT32 tx0; /* MSD see norm */ |
| 349 /** YTOsiz */ | 347 /** YTOsiz */ |
| 350 OPJ_UINT32 ty0; /* MSD see norm */ | 348 OPJ_UINT32 ty0; /* MSD see norm */ |
| 351 /** XTsiz */ | 349 /** XTsiz */ |
| 352 OPJ_UINT32 tdx; | 350 OPJ_UINT32 tdx; |
| 353 /** YTsiz */ | 351 /** YTsiz */ |
| 354 OPJ_UINT32 tdy; | 352 OPJ_UINT32 tdy; |
| 355 /** comment */ | 353 /** comment */ |
| 356 OPJ_CHAR *comment; | 354 OPJ_CHAR *comment; |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 void opj_j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters); | 587 void opj_j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters); |
| 590 | 588 |
| 591 /** | 589 /** |
| 592 * Creates a J2K compression structure | 590 * Creates a J2K compression structure |
| 593 * | 591 * |
| 594 * @return Returns a handle to a J2K compressor if successful, returns NULL othe
rwise | 592 * @return Returns a handle to a J2K compressor if successful, returns NULL othe
rwise |
| 595 */ | 593 */ |
| 596 opj_j2k_t* opj_j2k_create_compress(void); | 594 opj_j2k_t* opj_j2k_create_compress(void); |
| 597 | 595 |
| 598 | 596 |
| 599 void opj_j2k_setup_encoder(» opj_j2k_t *p_j2k, | 597 OPJ_BOOL opj_j2k_setup_encoder(»opj_j2k_t *p_j2k, |
| 600 opj_cparameters_t *parameter
s, | 598 opj_cparameters_t *parameter
s, |
| 601 opj_image_t *image, | 599 opj_image_t *image, |
| 602 opj_event_mgr_t * p_manager)
; | 600 opj_event_mgr_t * p_manager)
; |
| 603 | 601 |
| 604 /** | 602 /** |
| 605 Converts an enum type progression order to string type | 603 Converts an enum type progression order to string type |
| 606 */ | 604 */ |
| 607 char *opj_j2k_convert_progression_order(OPJ_PROG_ORDER prg_order); | 605 char *opj_j2k_convert_progression_order(OPJ_PROG_ORDER prg_order); |
| 608 | 606 |
| 609 /* ----------------------------------------------------------------------- */ | 607 /* ----------------------------------------------------------------------- */ |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 835 * codestream. | 833 * codestream. |
| 836 */ | 834 */ |
| 837 OPJ_BOOL opj_j2k_end_compress( opj_j2k_t *p_j2k, | 835 OPJ_BOOL opj_j2k_end_compress( opj_j2k_t *p_j2k, |
| 838 opj_stream_private_t
*cio, | 836 opj_stream_private_t
*cio, |
| 839 opj_event_mgr_t * p_
manager); | 837 opj_event_mgr_t * p_
manager); |
| 840 | 838 |
| 841 OPJ_BOOL opj_j2k_setup_mct_encoding (opj_tcp_t * p_tcp, opj_image_t * p_image); | 839 OPJ_BOOL opj_j2k_setup_mct_encoding (opj_tcp_t * p_tcp, opj_image_t * p_image); |
| 842 | 840 |
| 843 | 841 |
| 844 #endif /* __J2K_H */ | 842 #endif /* __J2K_H */ |
| OLD | NEW |