ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CV/CV.xs
(Generate patch)

Comparing CV/CV.xs (file contents):
Revision 1.56 by root, Wed Dec 27 17:48:16 2017 UTC vs.
Revision 1.58 by root, Mon Jan 4 04:49:04 2021 UTC

… …
24#if WEBP 24#if WEBP
25#include <webp/demux.h> 25#include <webp/demux.h>
26#include <webp/decode.h> 26#include <webp/decode.h>
27#endif 27#endif
28 28
29#if JXL
30#include <jxl/decode.h>
31#include "jxl/thread_parallel_runner.h"
32#endif
33
29#include "perlmulticore.h" 34#include "perlmulticore.h"
30 35
31#define IW 80 /* MUST match Schnauzer.pm! */ 36#define IW 80 /* MUST match Schnauzer.pm! */
32#define IH 60 /* MUST match Schnauzer.pm! */ 37#define IH 60 /* MUST match Schnauzer.pm! */
33
34#define RAND (seed = (seed + 7141) * 54773 % 134456)
35 38
36#define LINELENGTH 240 39#define LINELENGTH 240
37 40
38#define ELLIPSIS "\xe2\x80\xa6" 41#define ELLIPSIS "\xe2\x80\xa6"
39 42
… …
213{ 216{
214} 217}
215 218
216static boolean cv_ms_fill (j_decompress_ptr cinfo) 219static boolean cv_ms_fill (j_decompress_ptr cinfo)
217{ 220{
218 ERREXIT (cinfo, JERR_INPUT_EMPTY); 221 // unexpected EOF, warn and generate fake EOI marker
222
223 WARNMS (cinfo, JWRN_JPEG_EOF);
224
225 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src;
226
227 static const JOCTET eoi[] = { 0xFF, JPEG_EOI };
228
229 src->next_input_byte = eoi;
230 src->bytes_in_buffer = sizeof (eoi);
219 231
220 return TRUE; 232 return TRUE;
221} 233}
222 234
223static void cv_ms_skip (j_decompress_ptr cinfo, long num_bytes) 235static void cv_ms_skip (j_decompress_ptr cinfo, long num_bytes)
224{ 236{
225 if (num_bytes > 0)
226 {
227 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src; 237 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src;
228 238
229 src->next_input_byte += num_bytes; 239 src->next_input_byte += num_bytes;
230 src->bytes_in_buffer -= num_bytes; 240 src->bytes_in_buffer -= num_bytes;
231 }
232} 241}
233 242
234static void cv_jpeg_mem_src (j_decompress_ptr cinfo, void *buf, size_t buflen) 243static void cv_jpeg_mem_src (j_decompress_ptr cinfo, void *buf, size_t buflen)
235{ 244{
236 struct jpeg_source_mgr *src; 245 struct jpeg_source_mgr *src;
… …
247 src->skip_input_data = cv_ms_skip; 256 src->skip_input_data = cv_ms_skip;
248 src->resync_to_restart = jpeg_resync_to_restart; 257 src->resync_to_restart = jpeg_resync_to_restart;
249 src->term_source = cv_ms_term; 258 src->term_source = cv_ms_term;
250 src->next_input_byte = (JOCTET *)buf; 259 src->next_input_byte = (JOCTET *)buf;
251 src->bytes_in_buffer = buflen; 260 src->bytes_in_buffer = buflen;
261}
262
263/////////////////////////////////////////////////////////////////////////////
264
265/* great, the jpeg-xl reference implementaton requires us to parse bmff files */
266
267struct bmff_box
268{
269 char type[4];
270 const uint8_t *ptr;
271 size_t size;
272};
273
274static int
275bmff_parse_box (struct bmff_box *box, const uint8_t **next_in, size_t *avail_in)
276{
277 if (*avail_in < 8)
278 return 0;
279
280 box->size = ((*next_in)[0] << 24)
281 | ((*next_in)[1] << 16)
282 | ((*next_in)[2] << 8)
283 | ((*next_in)[3] );
284
285 if (box->size < 8)
286 return 0;
287
288 if (*avail_in < box->size)
289 return 0;
290
291 memcpy (box->type, *next_in + 4, 4);
292 box->ptr = *next_in + 8;
293
294 *next_in += box->size;
295 *avail_in -= box->size;
296
297 box->size -= 8;
298
299 return 1;
252} 300}
253 301
254///////////////////////////////////////////////////////////////////////////// 302/////////////////////////////////////////////////////////////////////////////
255 303
256MODULE = Gtk2::CV PACKAGE = Gtk2::CV 304MODULE = Gtk2::CV PACKAGE = Gtk2::CV
… …
369filetype (SV *image_data) 417filetype (SV *image_data)
370 CODE: 418 CODE:
371{ 419{
372 STRLEN data_len; 420 STRLEN data_len;
373 U8 *data = SvPVbyte (image_data, data_len); 421 U8 *data = SvPVbyte (image_data, data_len);
422 static const unsigned char jxl_header[] = {
423 0, 0, 0, 0x0c, 0x4a, 0x58, 0x4c, 0x20,
424 0x0d, 0xa, 0x87, 0x0a, 0, 0, 0, 0x14,
425 0x66, 0x74, 0x79, 0x70, 0x6a, 0x78, 0x6c, 0x20,
426 0, 0, 0, 0, 0x6a, 0x78, 0x6c, 0x20,
427 };
374 428
375 if (data_len >= 20 429 if (data_len >= 20
376 && data[0] == 0xff 430 && data[0] == 0xff
377 && data[1] == 0xd8 431 && data[1] == 0xd8
378 && data[2] == 0xff) 432 && data[2] == 0xff)
379 RETVAL = "jpg"; 433 RETVAL = "image/jpeg";
380 else if (data_len >= 12 434 else if (data_len >= 12
381 && data[ 0] == (U8)'R' 435 && data[ 0] == (U8)'R'
382 && data[ 1] == (U8)'I' 436 && data[ 1] == (U8)'I'
383 && data[ 2] == (U8)'F' 437 && data[ 2] == (U8)'F'
384 && data[ 3] == (U8)'F' 438 && data[ 3] == (U8)'F'
385 && data[ 8] == (U8)'W' 439 && data[ 8] == (U8)'W'
386 && data[ 9] == (U8)'E' 440 && data[ 9] == (U8)'E'
387 && data[10] == (U8)'B' 441 && data[10] == (U8)'B'
388 && data[11] == (U8)'P') 442 && data[11] == (U8)'P')
389 RETVAL = "webp"; 443 RETVAL = "image/webp";
390 else if (data_len >= 16 444 else if (data_len >= 16
391 && data[ 0] == 0x89 445 && data[ 0] == 0x89
392 && data[ 1] == (U8)'P' 446 && data[ 1] == (U8)'P'
393 && data[ 2] == (U8)'N' 447 && data[ 2] == (U8)'N'
394 && data[ 3] == (U8)'G' 448 && data[ 3] == (U8)'G'
395 && data[ 4] == 0x0d 449 && data[ 4] == 0x0d
396 && data[ 5] == 0x0a 450 && data[ 5] == 0x0a
397 && data[ 6] == 0x1a 451 && data[ 6] == 0x1a
398 && data[ 7] == 0x0a) 452 && data[ 7] == 0x0a)
399 RETVAL = "png"; 453 RETVAL = "image/png";
454 else if (data_len >= sizeof (jxl_header) && memcmp (data, jxl_header, sizeof (jxl_header)) == 0)
455 RETVAL = "image/jxl";
400 else 456 else
401 RETVAL = "other"; 457 XSRETURN_UNDEF;
402} 458}
403 OUTPUT: 459 OUTPUT:
404 RETVAL 460 RETVAL
405 461
406GdkPixbuf_noinc * 462GdkPixbuf_noinc *
… …
491} 547}
492 OUTPUT: 548 OUTPUT:
493 RETVAL 549 RETVAL
494 550
495GdkPixbuf_noinc * 551GdkPixbuf_noinc *
552decode_jxl (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
553 CODE:
554{
555#if JXL
556 JxlDecoder *dec = JxlDecoderCreate (0);
557 JxlBasicInfo info;
558 const uint8_t *next_in = (uint8_t *)SvPVbyte_nolen (image_data);
559 size_t avail_in = SvCUR (image_data);
560 const char *error = 0;
561 void *runner = 0;
562 struct bmff_box box;
563
564 perlinterp_release ();
565
566 RETVAL = 0;
567
568 error = "JxlDecoderCreate failed";
569 if (!dec)
570 goto done;
571
572 runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ());
573
574 error = "JxlDecoderSetParallelRunner failed";
575 if (JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner) != JXL_DEC_SUCCESS)
576 goto done;
577
578 error = "JxlDecoderSubscribeEvents failed";
579 if (JxlDecoderSubscribeEvents (dec, JXL_DEC_FULL_IMAGE | 0xffc0) != JXL_DEC_SUCCESS)
580 goto done;
581
582 for (;;)
583 {
584 JxlDecoderStatus status = JxlDecoderProcessInput (dec, &next_in, &avail_in);
585
586 printf ("status %d\n",status);
587
588 switch (status)
589 {
590 case JXL_DEC_ERROR:
591 error = "JxlDecoderProcessInput failed";
592 goto done;
593
594 case JXL_DEC_NEED_MORE_INPUT:
595 error = "incomplete file";
596 goto done;
597
598 case JXL_DEC_SUCCESS:
599 goto done;
600
601 case JXL_DEC_NEED_IMAGE_OUT_BUFFER:
602 {
603 error = "JxlDecoderGetBasicInfo failed";
604 if (JxlDecoderGetBasicInfo (dec, &info) != JXL_DEC_SUCCESS)
605 goto done;
606
607 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
608 error = "unable to allocate pixbuf";
609 if (!RETVAL)
610 goto done;
611
612 JxlPixelFormat format = {
613 info.alpha_bits ? 4 : 3,
614 JXL_TYPE_UINT8,
615 JXL_NATIVE_ENDIAN,
616 gdk_pixbuf_get_rowstride (RETVAL)
617 };
618
619 error = "JxlDecoderSetImageOutBuffer failed";
620 if (JxlDecoderSetImageOutBuffer (
621 dec,
622 &format,
623 gdk_pixbuf_get_pixels (RETVAL),
624 gdk_pixbuf_get_byte_length (RETVAL)
625 ) != JXL_DEC_SUCCESS)
626 goto done;
627 }
628 break;
629
630 default:
631 error = "unexpected event";
632 goto done;
633 }
634 }
635
636 done:
637 if (dec)
638 JxlDecoderDestroy (dec);
639
640 if (runner)
641 JxlThreadParallelRunnerDestroy (runner);
642
643 perlinterp_acquire ();
644
645 if (error)
646 {
647 if (RETVAL)
648 g_object_unref (RETVAL);
649
650 croak ("load_jxl: %s", error);
651 }
652#else
653 croak ("load_jxl: jpeg-xl not enabled at compile time");
654#endif
655}
656 OUTPUT:
657 RETVAL
658
659GdkPixbuf_noinc *
496decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) 660decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
497 CODE: 661 CODE:
498{ 662{
499 struct jpeg_decompress_struct cinfo; 663 struct jpeg_decompress_struct cinfo;
500 struct jpg_err_mgr jerr; 664 struct jpg_err_mgr jerr;
… …
520 g_object_unref ((gpointer)pb); 684 g_object_unref ((gpointer)pb);
521 685
522 perlinterp_acquire (); 686 perlinterp_acquire ();
523 XSRETURN_UNDEF; 687 XSRETURN_UNDEF;
524 } 688 }
689
690 if (!data_len)
691 longjmp (jerr.setjmp_buffer, 4);
525 692
526 jpeg_create_decompress (&cinfo); 693 jpeg_create_decompress (&cinfo);
527 cv_jpeg_mem_src (&cinfo, data, data_len); 694 cv_jpeg_mem_src (&cinfo, data, data_len);
528 695
529 jpeg_read_header (&cinfo, TRUE); 696 jpeg_read_header (&cinfo, TRUE);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines