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

Comparing CV/CV.xs (file contents):
Revision 1.53 by root, Sat Dec 23 05:27:04 2017 UTC vs.
Revision 1.60 by root, Thu Jul 15 00:41:44 2021 UTC

… …
20#include <gtk2perl.h> 20#include <gtk2perl.h>
21 21
22#include <assert.h> 22#include <assert.h>
23 23
24#if WEBP 24#if WEBP
25#include <webp/demux.h>
25#include <webp/decode.h> 26#include <webp/decode.h>
26#endif 27#endif
27 28
29#if JXL
30#include <jxl/decode.h>
31#include "jxl/thread_parallel_runner.h"
32#endif
33
28#include "perlmulticore.h" 34#include "perlmulticore.h"
29 35
30#define IW 80 /* MUST match Schnauzer.pm! */ 36#define IW 80 /* MUST match Schnauzer.pm! */
31#define IH 60 /* MUST match Schnauzer.pm! */ 37#define IH 60 /* MUST match Schnauzer.pm! */
32
33#define RAND (seed = (seed + 7141) * 54773 % 134456)
34 38
35#define LINELENGTH 240 39#define LINELENGTH 240
36 40
37#define ELLIPSIS "\xe2\x80\xa6" 41#define ELLIPSIS "\xe2\x80\xa6"
38 42
… …
200 204
201 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf); 205 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
202} 206}
203 207
204///////////////////////////////////////////////////////////////////////////// 208/////////////////////////////////////////////////////////////////////////////
209// memory source for libjpeg
205 210
206static void cv_ms_init (j_decompress_ptr cinfo) 211static void cv_ms_init (j_decompress_ptr cinfo)
207{ 212{
208} 213}
209 214
… …
211{ 216{
212} 217}
213 218
214static boolean cv_ms_fill (j_decompress_ptr cinfo) 219static boolean cv_ms_fill (j_decompress_ptr cinfo)
215{ 220{
216 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);
217 231
218 return TRUE; 232 return TRUE;
219} 233}
220 234
221static void cv_ms_skip (j_decompress_ptr cinfo, long num_bytes) 235static void cv_ms_skip (j_decompress_ptr cinfo, long num_bytes)
222{ 236{
223 if (num_bytes > 0)
224 {
225 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src; 237 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src;
226 238
227 src->next_input_byte += num_bytes; 239 src->next_input_byte += num_bytes;
228 src->bytes_in_buffer -= num_bytes; 240 src->bytes_in_buffer -= num_bytes;
229 }
230} 241}
231 242
232static 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)
233{ 244{
234 struct jpeg_source_mgr *src; 245 struct jpeg_source_mgr *src;
… …
249 src->bytes_in_buffer = buflen; 260 src->bytes_in_buffer = buflen;
250} 261}
251 262
252///////////////////////////////////////////////////////////////////////////// 263/////////////////////////////////////////////////////////////////////////////
253 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;
300}
301
302/////////////////////////////////////////////////////////////////////////////
303
254MODULE = Gtk2::CV PACKAGE = Gtk2::CV 304MODULE = Gtk2::CV PACKAGE = Gtk2::CV
255 305
256PROTOTYPES: ENABLE 306PROTOTYPES: ENABLE
257 307
308# calculate the common prefix length of two strings
258# missing function in perl. really :) 309# missing function in perl. really :)
259int 310int
260common_prefix_length (a, b) 311common_prefix_length (a, b)
261 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg); 312 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg);
262 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg); 313 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg);
… …
366filetype (SV *image_data) 417filetype (SV *image_data)
367 CODE: 418 CODE:
368{ 419{
369 STRLEN data_len; 420 STRLEN data_len;
370 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 };
371 428
372 if (data_len >= 20 429 if (data_len >= 20
373 && data[0] == 0xff 430 && data[0] == 0xff
374 && data[1] == 0xd8 431 && data[1] == 0xd8
375 && data[2] == 0xff) 432 && data[2] == 0xff)
376 RETVAL = "jpg"; 433 RETVAL = "image/jpeg";
377 else if (data_len >= 12 434 else if (data_len >= 12
378 && data[ 0] == (U8)'R' 435 && data[ 0] == (U8)'R'
379 && data[ 1] == (U8)'I' 436 && data[ 1] == (U8)'I'
380 && data[ 2] == (U8)'F' 437 && data[ 2] == (U8)'F'
381 && data[ 3] == (U8)'F' 438 && data[ 3] == (U8)'F'
382 && data[ 8] == (U8)'W' 439 && data[ 8] == (U8)'W'
383 && data[ 9] == (U8)'E' 440 && data[ 9] == (U8)'E'
384 && data[10] == (U8)'B' 441 && data[10] == (U8)'B'
385 && data[11] == (U8)'P') 442 && data[11] == (U8)'P')
386 RETVAL = "webp"; 443 RETVAL = "image/webp";
387 else if (data_len >= 16 444 else if (data_len >= 16
388 && data[ 0] == 0x89 445 && data[ 0] == 0x89
389 && data[ 1] == (U8)'P' 446 && data[ 1] == (U8)'P'
390 && data[ 2] == (U8)'N' 447 && data[ 2] == (U8)'N'
391 && data[ 3] == (U8)'G' 448 && data[ 3] == (U8)'G'
392 && data[ 4] == 0x0d 449 && data[ 4] == 0x0d
393 && data[ 5] == 0x0a 450 && data[ 5] == 0x0a
394 && data[ 6] == 0x1a 451 && data[ 6] == 0x1a
395 && data[ 7] == 0x0a) 452 && data[ 7] == 0x0a)
396 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";
397 else 456 else
398 RETVAL = "other"; 457 XSRETURN_UNDEF;
399} 458}
400 OUTPUT: 459 OUTPUT:
401 RETVAL 460 RETVAL
402 461
403GdkPixbuf_noinc * 462GdkPixbuf_noinc *
404decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) 463decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
405 CODE: 464 CODE:
406{ 465{
407#if WEBP 466#if WEBP
408 guchar *data;
409 STRLEN data_size; 467 STRLEN data_size;
410 int alpha; 468 int alpha;
469 WebPData data;
470 WebPDemuxer *demux;
471 WebPIterator iter;
411 WebPDecoderConfig config; 472 WebPDecoderConfig config;
412 int inw, inh; 473 int inw, inh;
413 474
414 data = SvPVbyte (image_data, data_size); 475 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
476 data.size = data_size;
415 477
416 perlinterp_release (); 478 perlinterp_release ();
417 479
418 RETVAL = 0; 480 RETVAL = 0;
419 481
482 if (!(demux = WebPDemux (&data)))
483 goto err_demux;
484
485 if (!WebPDemuxGetFrame (demux, 1, &iter))
486 goto err_iter;
487
420 if (!WebPInitDecoderConfig (&config)) 488 if (!WebPInitDecoderConfig (&config))
421 goto err; 489 goto err_iter;
422 490
423 config.options.use_threads = 1; 491 config.options.use_threads = 1;
424 492
425 if (WebPGetFeatures (data, data_size, &config.input) != VP8_STATUS_OK) 493 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
426 goto err; 494 goto err_iter;
427 495
428 inw = config.input.width; 496 inw = config.input.width;
429 inh = config.input.height; 497 inh = config.input.height;
430 498
431 if (thumbnail) 499 if (thumbnail)
… …
446 { 514 {
447 iw = inw; 515 iw = inw;
448 ih = inh; 516 ih = inh;
449 } 517 }
450 518
451 alpha = config.input.has_alpha; 519 alpha = !!config.input.has_alpha;
452 520
453 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!alpha, 8, iw, ih); 521 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
454 if (!RETVAL) 522 if (!RETVAL)
455 goto err; 523 goto err_iter;
456 524
457 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB; 525 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
458 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL); 526 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
459 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL); 527 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
460 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL); 528 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
461 config.output.is_external_memory = 1; 529 config.output.is_external_memory = 1;
462 530
463 if (WebPDecode (data, data_size, &config) != VP8_STATUS_OK) 531 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
464 { 532 {
465 g_object_unref (RETVAL); 533 g_object_unref (RETVAL);
466 RETVAL = 0; 534 RETVAL = 0;
467 goto err; 535 goto err_iter;
468 } 536 }
469 537
470 err: 538 err_iter:
539 WebPDemuxReleaseIterator (&iter);
540 err_demux:
541 WebPDemuxDelete (demux);
542
471 perlinterp_acquire (); 543 perlinterp_acquire ();
472#else 544#else
473 croak ("load_webp: webp not enabled at compile time"); 545 croak ("load_webp: webp not enabled at compile time");
546#endif
547}
548 OUTPUT:
549 RETVAL
550
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 | JXL_DEC_BASIC_INFO) != JXL_DEC_SUCCESS)
580 goto done;
581
582 error = "JxlDecoderSetInput failed";
583 if (JxlDecoderSetInput (dec, next_in, avail_in) != JXL_DEC_SUCCESS)
584 goto done;
585
586 for (;;)
587 {
588 JxlDecoderStatus status = JxlDecoderProcessInput (dec);
589
590 printf ("status %d\n",status);
591
592 switch (status)
593 {
594 case JXL_DEC_ERROR:
595 error = "JxlDecoderProcessInput failed";
596 goto done;
597
598 case JXL_DEC_NEED_MORE_INPUT:
599 error = "incomplete file";
600 goto done;
601
602 case JXL_DEC_SUCCESS:
603 goto done;
604
605 case JXL_DEC_NEED_IMAGE_OUT_BUFFER:
606 {
607 error = "JxlDecoderGetBasicInfo failed";
608 if (JxlDecoderGetBasicInfo (dec, &info) != JXL_DEC_SUCCESS)
609 goto done;
610
611 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
612 error = "unable to allocate pixbuf";
613 if (!RETVAL)
614 goto done;
615
616 JxlPixelFormat format = {
617 info.alpha_bits ? 4 : 3,
618 JXL_TYPE_UINT8,
619 JXL_NATIVE_ENDIAN,
620 gdk_pixbuf_get_rowstride (RETVAL)
621 };
622
623 error = "JxlDecoderSetImageOutBuffer failed";
624 if (JxlDecoderSetImageOutBuffer (
625 dec,
626 &format,
627 gdk_pixbuf_get_pixels (RETVAL),
628 gdk_pixbuf_get_byte_length (RETVAL)
629 ) != JXL_DEC_SUCCESS)
630 goto done;
631 }
632 break;
633
634 default:
635 error = "unexpected event";
636 goto done;
637 }
638 }
639
640 done:
641 if (dec)
642 JxlDecoderDestroy (dec);
643
644 if (runner)
645 JxlThreadParallelRunnerDestroy (runner);
646
647 perlinterp_acquire ();
648
649 if (error)
650 {
651 if (RETVAL)
652 g_object_unref (RETVAL);
653
654 croak ("load_jxl: %s", error);
655 }
656#else
657 croak ("load_jxl: jpeg-xl not enabled at compile time");
474#endif 658#endif
475} 659}
476 OUTPUT: 660 OUTPUT:
477 RETVAL 661 RETVAL
478 662
… …
504 g_object_unref ((gpointer)pb); 688 g_object_unref ((gpointer)pb);
505 689
506 perlinterp_acquire (); 690 perlinterp_acquire ();
507 XSRETURN_UNDEF; 691 XSRETURN_UNDEF;
508 } 692 }
693
694 if (!data_len)
695 longjmp (jerr.setjmp_buffer, 4);
509 696
510 jpeg_create_decompress (&cinfo); 697 jpeg_create_decompress (&cinfo);
511 cv_jpeg_mem_src (&cinfo, data, data_len); 698 cv_jpeg_mem_src (&cinfo, data, data_len);
512 699
513 jpeg_read_header (&cinfo, TRUE); 700 jpeg_read_header (&cinfo, TRUE);
… …
664 CODE: 851 CODE:
665{ 852{
666 STRLEN plen; 853 STRLEN plen;
667 U8 *path = (U8 *)SvPV (pathsv, plen); 854 U8 *path = (U8 *)SvPV (pathsv, plen);
668 U8 *pend = path + plen; 855 U8 *pend = path + plen;
669 U8 dst [plen * 6 * 3], *dstp = dst; 856 U8 dst [plen * 8 * 3], *dstp = dst;
670 857
671 while (path < pend) 858 while (path < pend)
672 { 859 {
673 U8 ch = *path; 860 U8 ch = *path;
674 861
… …
676 *dstp++ = *path++; 863 *dstp++ = *path++;
677 else if (ch >= 'A' && ch <= 'Z') 864 else if (ch >= 'A' && ch <= 'Z')
678 *dstp++ = *path++ + ('a' - 'A'); 865 *dstp++ = *path++ + ('a' - 'A');
679 else if (ch >= '0' && ch <= '9') 866 else if (ch >= '0' && ch <= '9')
680 { 867 {
868 /* version sort, up to 8 digits */
681 STRLEN el, nl = 0; 869 STRLEN el, nl = 0;
682 while (*path >= '0' && *path <= '9' && path < pend) 870 while (*path >= '0' && *path <= '9' && path < pend)
683 path++, nl++; 871 path++, nl++;
684 872
685 for (el = nl; el < 6; el++) 873 for (el = nl; el < 8; el++)
686 *dstp++ = '0'; 874 *dstp++ = '0';
687 875
688 memcpy (dstp, path - nl, nl); 876 memcpy (dstp, path - nl, nl);
689 dstp += nl; 877 dstp += nl;
690 } 878 }

Diff Legend

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